diff -r 2473f5e227f9 -r 8b72faa1200f telephonyserverplugins/simtsy/src/CSimDataCall.cpp
--- a/telephonyserverplugins/simtsy/src/CSimDataCall.cpp	Mon May 24 18:38:31 2010 +0100
+++ b/telephonyserverplugins/simtsy/src/CSimDataCall.cpp	Tue Jun 22 11:02:32 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies).
+// 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"
@@ -21,10 +21,16 @@
  @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)
 /**
@@ -61,7 +67,7 @@
  * @param aName name of the data call to be constructed
  */
 	{
-	LOGDATA1("Starting to parse Data Call config parameters...");
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMDATACALL_CONSTRUCTL_1, "Starting to parse Data Call config parameters...");
 
 	iDiallingPause=iLine->CfgFile()->ItemValue(KDiallingPauseDuration,KDefaultDiallingPauseDuration);
 	iConnectingPause=iLine->CfgFile()->ItemValue(KConnectingPauseDuration,KDefaultConnectingPauseDuration);
@@ -83,7 +89,7 @@
 		TInt ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,0,speedCaps);
 		if(ret!=KErrNone)
 			{
-			LOGPARSERR("speedCaps",ret,0,&KDataCallCaps);
+			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);
 			}
 		else
 			if(AsciiToNum(speedCaps, digit)==KErrNone)
@@ -92,7 +98,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,1,protocolCaps);
 		if(ret!=KErrNone)
 			{
-			LOGPARSERR("protocolCaps",ret,1,&KDataCallCaps);
+			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);
 			}
 		else
 			if(AsciiToNum(protocolCaps, digit)==KErrNone)
@@ -101,7 +107,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,2,serviceCaps);
 		if(ret!=KErrNone)
 			{
-			LOGPARSERR("serviceCaps",ret,2,&KDataCallCaps);
+			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);
 			}
 		else
 			if(AsciiToNum(serviceCaps, digit)==KErrNone)
@@ -111,7 +117,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,3,qosCaps);
 		if(ret!=KErrNone)
 			{
-			LOGPARSERR("qosCaps",ret,3,&KDataCallCaps);
+			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);
 			}
 		else
 			if(AsciiToNum(qosCaps, digit)==KErrNone)
@@ -120,7 +126,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,4,hscsdSupport);
 		if(ret!=KErrNone)
 			{
-			LOGPARSERR("hscsdSupport",ret,4,&KDataCallCaps);
+			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);
 			}
 		else
 			iMobileCallCaps.iHscsdSupport = hscsdSupport;
@@ -128,7 +134,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,5,mClass);
 		if(ret!=KErrNone)
 			{
-			LOGPARSERR("mClass",ret,5,&KDataCallCaps);
+			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);
 			}
 		else
 			iMobileCallCaps.iMClass = mClass;
@@ -136,7 +142,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,6,MaxRxTimeslots);
 		if(ret!=KErrNone)
 			{
-			LOGPARSERR("MaxRxTimeslots",ret,6,&KDataCallCaps);
+			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);
 			}
 		else
 			iMobileCallCaps.iMaxRxTimeSlots = MaxRxTimeslots;
@@ -144,7 +150,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,7,MaxTxTimeslots);
 		if(ret!=KErrNone)
 			{
-			LOGPARSERR("MaxTxTimeslots",ret,7,&KDataCallCaps);
+			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);
 			}
 		else
 			iMobileCallCaps.iMaxTxTimeSlots = MaxTxTimeslots;
@@ -153,7 +159,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,8,totalRxTxTimeslots);
 		if(ret!=KErrNone)
 			{
-			LOGPARSERR("totalRxTxTimeslots",ret,8,&KDataCallCaps);
+			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);
 			}
 		else
 			iMobileCallCaps.iTotalRxTxTimeSlots = totalRxTxTimeslots;
@@ -162,7 +168,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,9,codingCaps);
 		if(ret!=KErrNone)
 			{
-			LOGPARSERR("codingCaps",ret,9,&KDataCallCaps);
+			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);
 			}
 		else
 			if(AsciiToNum(codingCaps, digit)==KErrNone)
@@ -171,7 +177,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,10,asymmetryCaps);
 		if(ret!=KErrNone)
 			{
-			LOGPARSERR("asymmetryCaps",ret,10,&KDataCallCaps);
+			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);
 			}
 		else
 			if(AsciiToNum(asymmetryCaps, digit)==KErrNone)
@@ -180,7 +186,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,11,userInitUpgrade);
 		if(ret!=KErrNone)
 			{
-			LOGPARSERR("userInitUpgrade",ret,11,&KDataCallCaps);
+			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);
 			}
 		else
 			iMobileCallCaps.iUserInitUpgrade = userInitUpgrade;
@@ -189,7 +195,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,10,rlpVersionCaps);
 		if(ret!=KErrNone)
 			{
-			LOGPARSERR("rlpVersionCaps",ret,10,&KDataCallCaps);
+			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);
 			}
 		else
 			if(AsciiToNum(rlpVersionCaps, digit)==KErrNone)
@@ -198,7 +204,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,10,v42bisCaps);
 		if(ret!=KErrNone)
 			{
-			LOGPARSERR("v42bisCaps",ret,10,&KDataCallCaps);
+			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);
 			}
 		else
 			if(AsciiToNum(v42bisCaps, digit)==KErrNone)
@@ -241,7 +247,7 @@
 			TInt ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,0,iRlpVersion);
 			if(ret!=KErrNone)
 				{
-				LOGPARSERR("iRlpVersion",ret,0,&KDataRLPparams);
+				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);
 				}
 			else
 				iMobileCallRLPItem.iRlpVersion = iRlpVersion;
@@ -249,7 +255,7 @@
 			ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,0,iIWSMax);
 			if(ret!=KErrNone)
 				{
-				LOGPARSERR("iIWSMax",ret,0,&KDataRLPparams);
+				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);
 				}
 			else
 				iMobileCallRLPItem.iMobileCallRLP.iIWSMax = iIWSMax;
@@ -257,7 +263,7 @@
 			ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,1,iIWSMin);
 			if(ret!=KErrNone)
 				{
-				LOGPARSERR("iIWSMin",ret,1,&KDataRLPparams);
+				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);
 				}
 			else
 				iMobileCallRLPItem.iMobileCallRLP.iIWSMin = iIWSMin;
@@ -265,7 +271,7 @@
 			ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,2,iMWSMax);
 			if(ret!=KErrNone)
 				{
-				LOGPARSERR("iMWSMax",ret,2,&KDataRLPparams);
+				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);
 				}
 			else
 				iMobileCallRLPItem.iMobileCallRLP.iMWSMax = iMWSMax;
@@ -274,7 +280,7 @@
 			ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,3,iMWSMin);
 			if(ret!=KErrNone)
 				{
-				LOGPARSERR("iMWSMin",ret,3,&KDataRLPparams);
+				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);
 				}
 			else
 				iMobileCallRLPItem.iMobileCallRLP.iMWSMin = iMWSMin;
@@ -282,7 +288,7 @@
 			ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,4,iT1Max);
 			if(ret!=KErrNone)
 				{
-				LOGPARSERR("iT1Max",ret,4,&KDataRLPparams);
+				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);
 				}
 			else
 				iMobileCallRLPItem.iMobileCallRLP.iT1Max = iT1Max;
@@ -290,7 +296,7 @@
 			ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,5,iT1Min);
 			if(ret!=KErrNone)
 				{
-				LOGPARSERR("iT1Min",ret,5,&KDataRLPparams);
+				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);
 				}
 			else
 				iMobileCallRLPItem.iMobileCallRLP.iT1Min = iT1Min;
@@ -298,7 +304,7 @@
 			ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,6,iN2Max);
 			if(ret!=KErrNone)
 				{
-				LOGPARSERR("iN2Max",ret,6,&KDataRLPparams);
+				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);
 				}
 			else
 				iMobileCallRLPItem.iMobileCallRLP.iN2Max = iN2Max;
@@ -306,7 +312,7 @@
 			ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,7,iN2Min);
 			if(ret!=KErrNone)
 				{
-				LOGPARSERR("iN2Min",ret,7,&KDataRLPparams);
+				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);
 				}
 			else
 				iMobileCallRLPItem.iMobileCallRLP.iN2Min = iN2Min;
@@ -314,7 +320,7 @@
 			ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,8,iT4Max);
 			if(ret!=KErrNone)
 				{
-				LOGPARSERR("iT4Max",ret,8,&KDataRLPparams);
+				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);
 				}
 			else
 				iMobileCallRLPItem.iMobileCallRLP.iT4Max = iT4Max;
@@ -322,7 +328,7 @@
 			ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,9,iT4Min);
 			if(ret!=KErrNone)
 				{
-				LOGPARSERR("iT4Min",ret,9,&KDataRLPparams);
+				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);
 				}
 			else
 				iMobileCallRLPItem.iMobileCallRLP.iT4Min = iT4Min;
@@ -357,7 +363,7 @@
 		TInt ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,0,iAiur);
 		if(ret!=KErrNone)
 			{
-			LOGPARSERR("iAiur",ret,0,&KDynamicHSCSDInfo);
+			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);
 			}
 		else
 			if(AsciiToNum(iAiur, digit)==KErrNone)
@@ -366,7 +372,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,1,iRxTimeSlots);
 		if(ret!=KErrNone)
 			{
-			LOGPARSERR("iRxTimeSlots",ret,1,&KDynamicHSCSDInfo);
+			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);
 			}
 		else
 			iHscsdInfo.iRxTimeSlots = iRxTimeSlots;
@@ -374,7 +380,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,2,iTxTimeSlots);
 		if(ret!=KErrNone)
 			{
-			LOGPARSERR("iTxTimeSlots",ret,2,&KDynamicHSCSDInfo);
+			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);
 			}
 		else
 			iHscsdInfo.iTxTimeSlots = iTxTimeSlots;
@@ -382,7 +388,7 @@
 		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,3,iCodings);
 		if(ret!=KErrNone)
 			{
-			LOGPARSERR("iCodings",ret,3,&KDynamicHSCSDInfo);
+			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);
 			}
 		else
 			if(AsciiToNum(iCodings, digit)==KErrNone)
@@ -403,7 +409,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)
 			{
-			LOGPARSERR("csyName",err,0,&KCommSetup);
+			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);
 			iCsyName.Copy(KDefaultCsyName);
 			}
 		else
@@ -412,7 +418,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)
 			{
-			LOGPARSERR("portName",err,1,&KCommSetup);
+			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);
 			iPortName.Copy(KDefaultPortName);
 			}
 		else
@@ -422,7 +428,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)
 			{
-			LOGPARSERR("dataRate",err,2,&KCommSetup);
+			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);
 			iConfig.iRate=KDefaultCommPortRate;
 			}
 		else
@@ -431,7 +437,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)
 			{
-			LOGPARSERR("handshake",err,3,&KCommSetup);
+			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);
 			iConfig.iHandshake=KDefaultHandshake;
 			}
 		else
@@ -453,7 +459,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)
 			{
-			LOGPARSERR("bearerCaps",err,0,&KBearerService);
+			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);
 			iBearerService.iBearerCaps=KDefaultBearerCaps;
 			}
 		else
@@ -462,7 +468,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)
 			{
-			LOGPARSERR("bearerSpeed",err,1,&KBearerService);
+			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);
 			iBearerService.iBearerSpeed=KDefaultBearerSpeed;
 			}
 		else
@@ -492,17 +498,17 @@
  		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,0,delay);
  		if(ret!=KErrNone)
  			{
- 			LOGPARSERR("delay",ret,0,&KNotifyRemotePartyInfo);
+ 			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);
  			}
  		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,1,callingname);
  		if(ret!=KErrNone)
  			{
- 			LOGPARSERR("callingname",ret,1,&KNotifyRemotePartyInfo);
+ 			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);
  			}
  		ret=CTestConfig::GetElement(item->Value(),KStdDelimiter,2,remotenumber);
  		if(ret!=KErrNone)
  			{
- 			LOGPARSERR("remotenumber",ret,2,&KNotifyRemotePartyInfo);
+ 			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);
  			}
  		
  		iNotifyRemotePartyInfoTimer->iDelay = delay;
@@ -518,7 +524,7 @@
  		iNotifyRemotePartyInfoTimer->iRemotePartyInfoV1.iRemoteIdStatus = RMobileCall::ERemoteIdentityUnknown;
  		}
 	
-	LOGDATA1("...Finished parsing Data Call config parameters...");
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMDATACALL_CONSTRUCTL_40, "...Finished parsing Data Call config parameters...");
 	}
 
 CSimDataCall::~CSimDataCall()
@@ -553,7 +559,7 @@
 	TAny* dataPtr=aPackage.Ptr1();
 	TAny* dataPtr2=aPackage.Ptr2();
 
-	LOGDATA2("CSimDataCall::ExtFunc: IPC Number is %d",aIpc);
+	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMDATACALL_EXTFUNC_1, "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
 
@@ -609,7 +615,7 @@
  		return NotifyRemotePartyInfoChange(aTsyReqHandle, aPackage.Des1n());
 
 	default:
-		LOGDATA2("CSimDataCall::ExtFunc: Unsupported IPC detected - number %d",aIpc);
+		OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMDATACALL_EXTFUNC_2, "CSimDataCall::ExtFunc: Unsupported IPC detected - number %d",aIpc);
 		break;
 		}
 
@@ -651,7 +657,7 @@
  		return NotifyRemotePartyInfoChangeCancel();
 
 	default:
-		LOGDATA1("CSimDataCall::CancelService: No match for IPC, defering to base function");
+		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMDATACALL_CANCELSERVICE_1, "CSimDataCall::CancelService: No match for IPC, defering to base function");
 		break;
 		}
 	return CCallBase::CancelService(aIpc,aTsyReqHandle);
@@ -667,7 +673,7 @@
  * @return KErrNone
  */
 	{
-	LOGDATA1(">>CSimDataCall::Dial");
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMDATACALL_DIAL_1, ">>CSimDataCall::Dial");
 	iDialRequestHandle=aTsyReqHandle;
 	PopulateCallParams(aCallParams);
 
@@ -675,7 +681,7 @@
 	if(err!=KErrNone)
 		ReqCompleted(aTsyReqHandle,err);
 
-	LOGDATA1("<<CSimDataCall::Dial");
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMDATACALL_DIAL_2, "<<CSimDataCall::Dial");
 	return KErrNone;
 	}
 
@@ -687,7 +693,7 @@
 * @return KErrNone if successfully cancelled
 */
 	{
-	LOGDATA1(">>CSimDataCall::DialCancel");
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMDATACALL_DIALCANCEL_1, ">>CSimDataCall::DialCancel");
 	switch(iState)
 		{
 	case RMobileCall::EStatusIdle:
@@ -713,10 +719,10 @@
 		break;
 
 	default:
-		LOGDATA2("CSimDataCall::DialCancel: No action taken - state: %d",iState);
+		OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMDATACALL_DIALCANCEL_2, "CSimDataCall::DialCancel: No action taken - state: %d",iState);
 		break;
 		}
-	LOGDATA1("<<CSimDataCall::DialCancel");
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMDATACALL_DIALCANCEL_3, "<<CSimDataCall::DialCancel");
 	return KErrNone;
 	}
 
@@ -731,7 +737,7 @@
 * @return KErrNone
 */
 	{
-	LOGDATA1(">>CSimDataCall::AnswerIncomingCall");
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMDATACALL_ANSWERINCOMINGCALL_1, ">>CSimDataCall::AnswerIncomingCall");
 	TInt err=iLine->SetAutoAnswerCallObject(this);
 	if(err!=KErrNone)
 		{
@@ -754,7 +760,7 @@
 			ret = ActionEvent(ECallEventAnswerIncoming,KErrNone);	
 			}
 		}
-	LOGDATA1("<<CSimDataCall::AnswerIncomingCall");
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMDATACALL_ANSWERINCOMINGCALL_2, "<<CSimDataCall::AnswerIncomingCall");
 	return ret;
 	}
 
@@ -766,14 +772,14 @@
 * @return KErrNone if successfully cancelled
 */
 	{
-	LOGDATA1(">>CSimDataCall::AnswerIncomingCallCancel");
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMDATACALL_ANSWERINCOMINGCALLCANCEL_1, ">>CSimDataCall::AnswerIncomingCallCancel");
 	if(iAnswerIncomingCall.iNotifyPending)
 		{
 		iAnswerIncomingCall.iNotifyPending=EFalse;
 		iLine->ResetAutoAnswerCallObject(this);
 		ReqCompleted(iAnswerIncomingCall.iNotifyHandle,KErrCancel);
 		}
-	LOGDATA1("<<CSimDataCall::AnswerIncomingCallCancel");
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMDATACALL_ANSWERINCOMINGCALLCANCEL_2, "<<CSimDataCall::AnswerIncomingCallCancel");
 	return KErrNone;
 	}
 
@@ -797,12 +803,12 @@
 * @return KErrNone
 */
 	{
-	LOGDATA1(">>CSimDataCall::HangUp");
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMDATACALL_HANGUP_1, ">>CSimDataCall::HangUp");
 	iHangUpRequestHandle=aTsyReqHandle;
 	TInt err=ActionEvent(ECallEventHangUp,KErrNone);
 	if(err!=KErrNone)
 		ReqCompleted(aTsyReqHandle,err);
-	LOGDATA1("<<CSimDataCall::HangUp");
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMDATACALL_HANGUP_2, "<<CSimDataCall::HangUp");
 	return KErrNone;
 	}
 
@@ -814,7 +820,7 @@
 * @return KErrNone if successfully cancelled
 */
 	{
-	LOGDATA1(">>CSimDataCall::HangUpCancel");
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMDATACALL_HANGUPCANCEL_1, ">>CSimDataCall::HangUpCancel");
 	switch(iState)
 		{
 	case RMobileCall::EStatusIdle:
@@ -838,10 +844,10 @@
 		break;
 
 	default:
-		LOGDATA2("CSimDataCall::HangUpCancel: No action taken - state: %d",iState);
+		OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMDATACALL_HANGUPCANCEL_2, "CSimDataCall::HangUpCancel: No action taken - state: %d",iState);
 		break;
 		}
-	LOGDATA1("<<CSimDataCall::HangUpCancel");
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMDATACALL_HANGUPCANCEL_3, "<<CSimDataCall::HangUpCancel");
 	return KErrNone;
 	}
 
@@ -1001,7 +1007,7 @@
 	switch(aEvent)
 		{
 	case ECallEventDial:
-		LOGDATA1(">>CSimDataCall::ActionEvent = [ECallEventDial]");
+		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMDATACALL_ACTIONEVENT_1, ">>CSimDataCall::ActionEvent = [ECallEventDial]");
 		if(iState==RMobileCall::EStatusIdle)
 			{
 			TRAP(ret, ret=ChangeStateL(RMobileCall::EStatusDialling,EFalse,EFalse));
@@ -1014,7 +1020,7 @@
 
 	case ECallEventHangUp:
 		{
-		LOGDATA1(">>CSimDataCall::ActionEvent = [ECallEventHangUp]");
+		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMDATACALL_ACTIONEVENT_2, ">>CSimDataCall::ActionEvent = [ECallEventHangUp]");
 		switch(iState)
 			{
 		case RMobileCall::EStatusConnected:
@@ -1037,7 +1043,7 @@
 		break;
 
 	case ECallEventIncomingCall:
-		LOGDATA1(">>CSimDataCall::ActionEvent = [ECallEventIncomingCall]");
+		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMDATACALL_ACTIONEVENT_3, ">>CSimDataCall::ActionEvent = [ECallEventIncomingCall]");
 		if(iState==RMobileCall::EStatusIdle)
 			{
 			if(iAnswerIncomingCall.iNotifyPending)
@@ -1056,7 +1062,7 @@
 		break;
 
 	case ECallEventAnswerIncoming:
-		LOGDATA1(">>CSimDataCall::ActionEvent = [ECallEventAnswerIncoming]");
+		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMDATACALL_ACTIONEVENT_4, ">>CSimDataCall::ActionEvent = [ECallEventAnswerIncoming]");
 		if(iState==RMobileCall::EStatusRinging)
 			{
 			TRAP(ret, ret=ProcessAnswerIncomingCallL());
@@ -1066,7 +1072,7 @@
 		break;
 
 	case ECallEventRemoteHangup:
-		LOGDATA1(">>CSimDataCall::ActionEvent = [ECallEventRemoteHangup]");
+		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMDATACALL_ACTIONEVENT_5, ">>CSimDataCall::ActionEvent = [ECallEventRemoteHangup]");
 		if(iState==RMobileCall::EStatusConnected)
 			{
 			TRAP(ret, ret=ProcessRemoteHangupL());
@@ -1077,18 +1083,18 @@
 
 	case ECallEventTimeOut:
 			{
-			LOGDATA1(">>CSimVoiceCall::ActionEvent = [ECallEventTimeOut]");
+			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMDATACALL_ACTIONEVENT_6, ">>CSimVoiceCall::ActionEvent = [ECallEventTimeOut]");
 			switch(iState)
 				{
 			case RMobileCall::EStatusDialling:
-				LOGDATA1(">>CSimDataCall::State = [EStatusDialling]");
+				OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMDATACALL_ACTIONEVENT_7, ">>CSimDataCall::State = [EStatusDialling]");
 				TRAP(ret, ret=ChangeStateL(RMobileCall::EStatusConnecting,EFalse,EFalse));
 				if(ret==KErrNone)
 					iTimer->Start(iConnectingPause,this);
 				return ret;
 
 			case RMobileCall::EStatusConnecting:
-				LOGDATA1(">>CSimDataCall::State = [EStatusConnecting]");
+				OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMDATACALL_ACTIONEVENT_8, ">>CSimDataCall::State = [EStatusConnecting]");
 // If the config file has not spec'ed a CSY, then fail the dial...
 				if(iCsyName.Length()==0)
 					{
@@ -1104,19 +1110,19 @@
 				return ret;
 
 			case RMobileCall::EStatusDisconnecting:
-				LOGDATA1(">>CSimDataCall::State = [EStatusDisconnecting]");
+				OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMDATACALL_ACTIONEVENT_9, ">>CSimDataCall::State = [EStatusDisconnecting]");
 				TRAP(ret, ret=ChangeStateL(RMobileCall::EStatusIdle,EFalse,EFalse));
 				ReqCompleted(iHangUpRequestHandle,ret);
 				return ret;
 
 			case RMobileCall::EStatusAnswering:
-				LOGDATA1(">>CSimDataCall::State = [EStatusAnswering]");
+				OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMDATACALL_ACTIONEVENT_10, ">>CSimDataCall::State = [EStatusAnswering]");
 				TRAP(ret, ret=ChangeStateL(RMobileCall::EStatusConnected,EFalse,EFalse));
 				ReqCompleted(iAnswerIncomingCall.iNotifyHandle,ret);
 				return ret;
 
 			default:
-				LOGDATA2(">>CSimDataCall::State = [%d]",iState);
+				OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMDATACALL_ACTIONEVENT_11, ">>CSimDataCall::State = [%d]",iState);
 				break;
 				}
 			}
@@ -1152,10 +1158,10 @@
 * function for further processing.
 */
 	{
-	LOGDATA1(">>CSimDataCall::TimerCallBack");
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMDATACALL_TIMERCALLBACK_1, ">>CSimDataCall::TimerCallBack");
 	TInt err=ActionEvent(ECallEventTimeOut,KErrNone);
 	__ASSERT_ALWAYS(err==KErrNone,SimPanic(ETimeOutEventActionFailed));
-	LOGDATA1("<<CSimDataCall::TimerCallBack");
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMDATACALL_TIMERCALLBACK_2, "<<CSimDataCall::TimerCallBack");
 	}
 
 TInt CSimDataCall::ProcessAnswerIncomingCallL()
@@ -1166,14 +1172,14 @@
 * call object must be assigned to receive the details of the next incoming call.
 */
 	{
-	LOGDATA1(">>CSimDataCall::ProcessAnswerIncomingCall");
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMDATACALL_PROCESSANSWERINCOMINGCALLL_1, ">>CSimDataCall::ProcessAnswerIncomingCall");
 	TInt ret=ChangeStateL(RMobileCall::EStatusAnswering,EFalse,EFalse);
 	if(ret!=KErrNone)
 		return ret;
 	iTimer->Start(iAnswerIncomingPause,this);
 	iAnswerIncomingCall.iNotifyPending=EFalse;
 	iLine->ResetAutoAnswerCallObject(this);
-	LOGDATA1("<<CSimDataCall::ProcessAnswerIncomingCall");
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMDATACALL_PROCESSANSWERINCOMINGCALLL_2, "<<CSimDataCall::ProcessAnswerIncomingCall");
 	return ret;
 	}
 
@@ -1185,13 +1191,13 @@
 * call object must be assigned to be the next remotely hung up call.
 */
 	{
-	LOGDATA1(">>CSimDataCall::ProcessRemoteHangupL");
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMDATACALL_PROCESSREMOTEHANGUPL_1, ">>CSimDataCall::ProcessRemoteHangupL");
 	TInt ret=ChangeStateL(RMobileCall::EStatusDisconnecting,EFalse,EFalse);
 	if(ret!=KErrNone)
 		return ret;
 	iTimer->Start(iRemoteHangupPause,this);
 	iLine->ResetRemoteHangupCallObject(this);
-	LOGDATA1("<<CSimDataCall::ProcessRemoteHangupL");
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSIMDATACALL_PROCESSREMOTEHANGUPL_2, "<<CSimDataCall::ProcessRemoteHangupL");
 	return ret;
 	}