--- a/telephonyserver/etelserverandcore/SETEL/ET_CORE.CPP	Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserver/etelserverandcore/SETEL/ET_CORE.CPP	Fri Jun 11 14:49:29 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 1997-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 1997-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"
@@ -13,11 +13,18 @@
 // 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
@@ -179,7 +186,7 @@
 //	This is for all object inherit fron CSubSessionBase
 //
 	{
-	LOGTEXT("~CCallBase");
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CCALLBASE_DTOR_1, "~CCallBase");
 	}
 
 EXPORT_C TInt CCallBase::CancelService(const TInt aIpc,const TTsyReqHandle aTsyReqHandle)
@@ -326,7 +333,7 @@
 // if is owner then set to EUnOwned
 //
 	{
-	LOGTEXT("CCallBase::CloseSubSessionPreProcessing() - about to create dummy session");
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CCALLBASE_CLOSESUBSESSIONPREPROCESSING_1, "CCallBase::CloseSubSessionPreProcessing() - about to create dummy session");
 	CreateDummySession(aSession,aSubSessionHandle);
 	RCall::TOwnershipStatus owner=CheckOwnershipBySession(aSession,aSubSessionHandle);
 	if (owner==RCall::EOwnershipOwnedByThisClient)
@@ -674,7 +681,7 @@
 //	D'Tor
 //
 	{
-	LOGTEXT("~CLineBase");
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CLINEBASE_DTOR_1, "~CLineBase");
 	}
 
 EXPORT_C TInt CLineBase::CancelService(const TInt aIpc,const TTsyReqHandle aTsyReqHandle)
@@ -786,7 +793,7 @@
 // 
 //
 	{
-	LOGTEXT("CLineBase::CloseSubSessionPreProcessing() - about to create dummy session");
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CLINEBASE_CLOSESUBSESSIONPREPROCESSING_1, "CLineBase::CloseSubSessionPreProcessing() - about to create dummy session");
 	CreateDummySession(aSession,aSubSessionHandle);
 	FlushReqs(aSession,aSubSessionHandle);
 	}
@@ -862,7 +869,7 @@
 //	This is for all object inherit fron CSubSesissionBase
 //
 	{
-	LOGTEXT("~CPhoneBase");
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CPHONEBASE_DTOR_1, "~CPhoneBase");
 	}
 
 //
@@ -1051,7 +1058,7 @@
 //	Add reqEntry to the 'active list'
 //
 	{
-	LOGTEXT2("CPhoneBase::AddReqToActive with TsyHandle of %d", aReqEntry->iTsyReqHandle);
+	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPHONEBASE_ADDREQTOACTIVE_1, "CPhoneBase::AddReqToActive with TsyHandle of %d", aReqEntry->iTsyReqHandle);
 	iReqActiveList.AddLast(*aReqEntry);
 	}
 
@@ -1060,7 +1067,7 @@
 //	Add entry to the 'wait list'
 //
 	{
-	LOGTEXT2("CPhoneBase::AddReqToWaiting with TsyHandle of %d", aReqEntry->iTsyReqHandle);
+	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPHONEBASE_ADDREQTOWAITING_1, "CPhoneBase::AddReqToWaiting with TsyHandle of %d", aReqEntry->iTsyReqHandle);
 	iReqWaitList.AddLast(*aReqEntry);
 	}
 
@@ -1110,7 +1117,7 @@
 //  Find if any active request if so create a dummy session
 //
 	{
-	LOGTEXT("CPhoneBase::CloseSubSessionPreProcessing");
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_BORDER, CPHONEBASE_CLOSESUBSESSIONPREPROCESSING_1, "CPhoneBase::CloseSubSessionPreProcessing");
 	CreateDummySession(aSession,aSubSessionHandle);
 	FlushReqs(aSession,aSubSessionHandle);
 	}
@@ -1270,7 +1277,7 @@
 // Increase iFlowControlCnt
 //
 	{
-	LOGTEXT3("Incrementing Flow Control from %d to %d", iFlowControlCnt, iFlowControlCnt+1);
+	OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPHONEBASE_FLOWCONTROLINC_1, "Incrementing Flow Control from %d to %d", iFlowControlCnt, iFlowControlCnt+1);
 	iFlowControlCnt++;
 	}
 
@@ -1280,7 +1287,7 @@
 //
 	{
 	__ASSERT_ALWAYS((iFlowControlCnt>0),Fault(EEtelFaultNegativeFlowcontrolCount));
-	LOGTEXT3("Decrementing Flow Control from %d to %d", iFlowControlCnt, iFlowControlCnt-1);
+	OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPHONEBASE_FLOWCONTROLDEC_1, "Decrementing Flow Control from %d to %d", iFlowControlCnt, iFlowControlCnt-1);
 	iFlowControlCnt--;
 	}