--- a/telephonyprotocols/pdplayer/src/pdptiermanager.cpp	Mon May 03 13:37:20 2010 +0300
+++ b/telephonyprotocols/pdplayer/src/pdptiermanager.cpp	Thu May 13 20:08:44 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
+// 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"
@@ -18,6 +18,12 @@
  @internalComponent
 */
 
+
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "pdptiermanagerTraces.h"
+#endif
+
 #include "pdptiermanager.h"
 #include "mbmsengine.h"
 #include "pdptiermanagerselector.h"
@@ -26,13 +32,12 @@
 #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;
@@ -171,15 +176,15 @@
 	}
 
 void CPrimaryContextsMonitor::ProcessError(
-	#ifdef _DEBUG
-		TInt aError
-	#else	//remove compilation warning in release builds
-		TInt /*aError*/
-	#endif
-	)
+    #if (OST_TRACE_CATEGORY_DEBUG)
+        TInt aError
+    #else   //remove compilation warning in release builds
+        TInt /*aError*/
+    #endif
+        )
 	{
 	__ASSERT_DEBUG(aError != KErrNone, User::Invariant());
-	__FLOG_STATIC1(KPDPTierMgrTag, KPDPTierMgrSubTag, _L("PDP context monitoring error: %d"), aError);
+	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPRIMARYCONTEXTSMONITOR_PROCESSERROR_1, ("PDP context monitoring error: %d"), aError);
 	}
 
 void CPrimaryContextsMonitor::RunL()
@@ -437,7 +442,7 @@
 */
 MProviderSelector* CPDPTierManager::DoCreateProviderSelectorL(const Meta::SMetaData& aSelectionPreferences)
 	{
-	__CFLOG_VAR((KPDPTierMgrTag, KPDPTierMgrSubTag, _L8("CPdpTierManager[%08x]::DoSelectProvider()"), this));
+	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPTIERMANAGER_DOCREATEPROVIDERSELECTORL_1, "CPdpTierManager[%08x]::DoSelectProvider()", (TUint)this);
 	return TPdpSelectorFactory::NewSelectorL(aSelectionPreferences);
 	}
 
@@ -448,7 +453,7 @@
 */
 void CPDPTierManager::ConstructL()
 	{
-	__CFLOG_VAR((KPDPTierMgrTag, KPDPTierMgrSubTag, _L8("ConstructL::In CPDPTierManager")));
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPDPTIERMANAGER_CONSTRUCTL_1, "ConstructL::In CPDPTierManager");
 	iMBMSEngine = CMBMSEngine::NewL(NodeId(), *this);
 	}
 

--- a/telephonyserver/etelserverandcore/group/telephony_etel.mrp	Mon May 03 13:37:20 2010 +0300
+++ b/telephonyserver/etelserverandcore/group/telephony_etel.mrp	Thu May 13 20:08:44 2010 +0100
@@ -1,19 +1,3 @@
-#
-# Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-# All rights reserved.
-# This component and the accompanying materials are made available
-# under the terms of "Eclipse Public License v1.0"
-# which accompanies 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	telephony_etel
 
 source \sf\os\cellularsrv\telephonyserver\etelserverandcore\bwins
@@ -27,6 +11,7 @@
 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