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