diff -r 630d2f34d719 -r 07a122eea281 telephonyserverplugins/simtsy/src/CSimUsimR6.cpp
--- 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;
 	}