diff -r 630d2f34d719 -r 07a122eea281 telephonyserverplugins/common_tsy/commontsy/src/mmpacket/Cmmpacketcontexttsy.cpp
--- a/telephonyserverplugins/common_tsy/commontsy/src/mmpacket/Cmmpacketcontexttsy.cpp	Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyserverplugins/common_tsy/commontsy/src/mmpacket/Cmmpacketcontexttsy.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"
@@ -16,16 +16,11 @@
 
 
 // INCLUDE FILES
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "CmmpacketcontexttsyTraces.h"
-#endif
-
 #include "Cmmpacketcontexttsy.h"
 #include "Cmmpacketcontextlist.h"
 #include "cmmpacketservicegsmwcdmaext.h"
 #include "CMmPacketTsy.h"
+#include <ctsy/tflogger.h>
 #include "MmTsy_timeoutdefs.h"
 #include "MmTsy_numberOfSlots.h"
 
@@ -43,7 +38,7 @@
         const TDes& aName,  
         const TUint8 aProxyId ) 
     {
-OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTTSY_NEWL_1,  "TSY: CMmPacketContextTsy::NewL. Context name:%S", aName );
+TFLOGSTRING2( "TSY: CMmPacketContextTsy::NewL. Context name:%S", &aName );
 
     CMmPacketContextTsy* packetContext = new ( ELeave ) CMmPacketContextTsy();
 
@@ -66,7 +61,7 @@
     
 CMmPacketContextTsy::~CMmPacketContextTsy()
     {
-OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTTSY_DTOR_1,  "TSY: CMmPacketContextTsy::~CMmPacketContextTsy. Context name: %S", iContextName );
+TFLOGSTRING2( "TSY: CMmPacketContextTsy::~CMmPacketContextTsy. Context name: %S", &iContextName );
 	
 	if( iMmPacketService )
 		{
@@ -164,7 +159,7 @@
         const TInt aIpc, 
         const TDataPackage& aPackage )  
     {
-OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTTSY_EXTFUNC_1,  "TSY: CMmPacketContextTsy::ExtFunc. IPC: %d Context name:%S", aIpc, iContextName );
+TFLOGSTRING3( "TSY: CMmPacketContextTsy::ExtFunc. IPC: %d Context name:%S", aIpc, &iContextName );
 
     TInt ret( KErrNone );
     TInt trapError( KErrNone );
@@ -222,7 +217,8 @@
         const TInt aIpc,      
         const TDataPackage& aPackage )   
     {
-OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTTSY_DOEXTFUNCL_1,  "TSY: CMmPacketContextTsy::DoExtFuncL. IPC: %d Handle:%d",aIpc, aTsyReqHandle );
+TFLOGSTRING3( "TSY: CMmPacketContextTsy::DoExtFuncL. IPC: %d Handle:%d",
+                aIpc, aTsyReqHandle );
 
     TInt ret( KErrNotSupported );
 
@@ -388,7 +384,7 @@
 CTelObject::TReqMode CMmPacketContextTsy::ReqModeL( 
         const TInt aIpc ) 
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTTSY_REQMODEL_1,  "TSY: CMmPacketContextTsy::ReqModeL. IPC: %d", aIpc );
+TFLOGSTRING2( "TSY: CMmPacketContextTsy::ReqModeL. IPC: %d", aIpc );
 
     CTelObject::TReqMode reqMode( 0 );
     TBool doLeave( EFalse );
@@ -531,7 +527,8 @@
             break;
 
         }  
-OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTTSY_NUMBEROFSLOTSL_1,  "TSY: CMmPacketContextTsy::NumberOfSlotsL. IPC: %d Number of slots: %d",aIpc, numberOfSlots );
+TFLOGSTRING3( "TSY: CMmPacketContextTsy::NumberOfSlotsL. IPC: %d Number of slots: %d",
+                aIpc, numberOfSlots );
 
     return numberOfSlots;
 
@@ -553,7 +550,8 @@
         const TInt aIpc,                            
         const TTsyReqHandle aTsyReqHandle )         
     {
-OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTTSY_CANCELSERVICE_1,  "TSY: CMmPacketContextTsy::CancelService. IPC: %d Handle:%d",aIpc, aTsyReqHandle );
+TFLOGSTRING3( "TSY: CMmPacketContextTsy::CancelService. IPC: %d Handle:%d",
+                aIpc, aTsyReqHandle );
 
     TInt ret( KErrNone );
 	TTsyReqHandle reqHandle( NULL );
@@ -677,7 +675,7 @@
 TInt CMmPacketContextTsy::RegisterNotification( 
         const TInt aIpc )              
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTTSY_REGISTERNOTIFICATION_1,  "TSY: CMmPacketContextTsy::RegisterNotification. IPC: %d", aIpc );
+TFLOGSTRING2( "TSY: CMmPacketContextTsy::RegisterNotification. IPC: %d", aIpc );
 
     TInt ret( KErrNone );
 
@@ -719,7 +717,7 @@
 TInt CMmPacketContextTsy::DeregisterNotification(
         const TInt aIpc )                          
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTTSY_DEREGISTERNOTIFICATION_1,  "TSY: CMmPacketContextTsy::DeregisterNotification. IPC: %d", aIpc );
+TFLOGSTRING2( "TSY: CMmPacketContextTsy::DeregisterNotification. IPC: %d", aIpc );
 
     TInt ret( KErrNone );
 
@@ -756,12 +754,12 @@
 CTelObject* CMmPacketContextTsy::OpenNewObjectL(    
         TDes& aNewName )                          
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTTSY_OPENNEWOBJECTL_1,  "TSY: CMmPacketContextTsy::OpenNewObjectL." );
+TFLOGSTRING( "TSY: CMmPacketContextTsy::OpenNewObjectL." );
 
     // Each context can have only one QoS
     if ( NULL != iQoSProfile )
         {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTTSY_OPENNEWOBJECTL_2,  "TSY: CMmPacketContextTsy::OpenNewObjectL. Leaves with: %d", KErrAlreadyExists );
+TFLOGSTRING2( "TSY: CMmPacketContextTsy::OpenNewObjectL. Leaves with: %d", KErrAlreadyExists );
         User::Leave( KErrAlreadyExists );
         }
     
@@ -773,7 +771,7 @@
         iQoSProfileName.Copy( iContextName );
         aNewName.Copy( iQoSProfileName );
         }
-OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTTSY_OPENNEWOBJECTL_3,  "TSY: CMmPacketContextTsy::OpenNewObjectL. aNewName: %S", aNewName );
+TFLOGSTRING2( "TSY: CMmPacketContextTsy::OpenNewObjectL. aNewName: %S", &aNewName );
 
     return iQoSProfile;
     }
@@ -789,11 +787,11 @@
 CTelObject* CMmPacketContextTsy::OpenNewObjectByNameL(    
         const TDesC& aName )                     
     {
-OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTTSY_OPENNEWOBJECTBYNAMEL_1,  "TSY: CMmPacketContextTsy::OpenNewObjectByNameL. aName: %S", aName );
+TFLOGSTRING2( "TSY: CMmPacketContextTsy::OpenNewObjectByNameL. aName: %S", &aName );
 
     if ( aName != iQoSProfileName )
         {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTTSY_OPENNEWOBJECTBYNAMEL_2,  "TSY: CMmPacketContextTsy::OpenNewObjectByNameL. Leaves with: %d", KErrNotFound );
+TFLOGSTRING2( "TSY: CMmPacketContextTsy::OpenNewObjectByNameL. Leaves with: %d", KErrNotFound );
         User::Leave( KErrNotFound );
         }
 
@@ -808,7 +806,7 @@
 //
 TInt CMmPacketContextTsy::InitialiseContextL(RPacketContext::TDataChannelV2* aDataChannel )
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTTSY_INITIALISECONTEXTL_1,  "TSY: CMmPacketContextTsy::InitialiseContextL." );
+TFLOGSTRING( "TSY: CMmPacketContextTsy::InitialiseContextL." );
 
     TInt ret( KErrNone );
 
@@ -832,7 +830,7 @@
 //
 void CMmPacketContextTsy::CompleteInitialiseContext(const TInt aResult )     
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTTSY_COMPLETEINITIALISECONTEXT_1,  "TSY: CMmPacketContextTsy::CompleteInitialiseContext. Error: %d", aResult );
+TFLOGSTRING2( "TSY: CMmPacketContextTsy::CompleteInitialiseContext. Error: %d", aResult );
 
     // Reset the req handle. Returns the deleted req handle
     TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle(
@@ -859,7 +857,7 @@
 //
 TInt CMmPacketContextTsy::ActivateL()
     {
-OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTTSY_ACTIVATEL_1,  "TSY: CMmPacketContextTsy::ActivateL. Context name:%S", iContextName );
+TFLOGSTRING2( "TSY: CMmPacketContextTsy::ActivateL. Context name:%S", &iContextName );
 
     TInt ret( KErrGprsServicesNotAllowed );
 
@@ -887,7 +885,7 @@
 void CMmPacketContextTsy::CompleteActivate( 
         const TInt aResult )
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTTSY_COMPLETEACTIVATE_1,  "TSY: CMmPacketContextTsy::CompleteActivate. Error: %d", aResult );
+TFLOGSTRING2( "TSY: CMmPacketContextTsy::CompleteActivate. Error: %d", aResult );
     // Reset the req handle. Returns the deleted req handle
     TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle(
         EMultimodePacketContextActivate );
@@ -908,7 +906,7 @@
 //
 TInt CMmPacketContextTsy::DeactivateL()
     {
-OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTTSY_DEACTIVATEL_1,  "TSY: CMmPacketContextTsy::DeactivateL. Context name:%S", iContextName );
+TFLOGSTRING2( "TSY: CMmPacketContextTsy::DeactivateL. Context name:%S", &iContextName );
     TInt ret( KErrNone );
 
     // Call Deactivate
@@ -932,7 +930,7 @@
 void CMmPacketContextTsy::CompleteDeactivate( 
         const TInt aResult )    
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTTSY_COMPLETEDEACTIVATE_1,  "TSY: CMmPacketContextTsy::CompleteDeactivate. Error: %d", aResult );
+TFLOGSTRING2( "TSY: CMmPacketContextTsy::CompleteDeactivate. Error: %d", aResult );
     // Reset the req handle. Returns the deleted req handle
     TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle(
         EMultimodePacketContextDeactivate );
@@ -956,7 +954,7 @@
 //
 TInt CMmPacketContextTsy::DeleteL()
     {
-OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTTSY_DELETEL_1,  "TSY: CMmPacketContextTsy::DeleteL. Context name:%S", iContextName );
+TFLOGSTRING2( "TSY: CMmPacketContextTsy::DeleteL. Context name:%S", &iContextName );
 
     TInt ret( KErrNone );
 
@@ -981,7 +979,7 @@
 void CMmPacketContextTsy::CompleteDelete( 
         const TInt aResult )        
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTTSY_COMPLETEDELETE_1,  "TSY: CMmPacketContextTsy::CompleteDelete. Error: %d", aResult );
+TFLOGSTRING2( "TSY: CMmPacketContextTsy::CompleteDelete. Error: %d", aResult );
     // Reset the req handle. Returns the deleted req handle
     TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle(
         EMultimodePacketContextDelete );
@@ -1003,7 +1001,7 @@
         const TTsyReqHandle aTsyReqHandle,    
         TPacketDataConfigBase* const aConfig )  
     {
-OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTTSY_GETCONFIG_1,  "TSY: CMmPacketContextTsy::GetConfig. Context name:%S", iContextName );
+TFLOGSTRING2( "TSY: CMmPacketContextTsy::GetConfig. Context name:%S", &iContextName );
 
     // Get config
     TInt ret = iMmPacketContextGsmWcdmaExt->GetConfig( aConfig );
@@ -1024,7 +1022,8 @@
         const TTsyReqHandle aTsyReqHandle,         
         TUint* const aRate ) 
     {
-OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTTSY_GETCONNECTIONSPEED_1,  "TSY: CMmPacketContextTsy::GetConnectionSpeed. Context name: %S Connection Speed:%u bps",iContextName, iConnectionSpeed );
+TFLOGSTRING3( "TSY: CMmPacketContextTsy::GetConnectionSpeed. Context name: %S Connection Speed:%d bps",
+             &iContextName, iConnectionSpeed );
 
     // Get current connection speed rate
     *aRate = iConnectionSpeed;
@@ -1045,7 +1044,7 @@
         const TTsyReqHandle aTsyReqHandle,   
         RPacketContext::TDataVolume* const aVolume ) 
     {
-OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTTSY_GETDATAVOLUMETRANSFERREDL_1,  "TSY: CMmPacketContextTsy::GetDataVolumeTransferredL. Context name:%S", iContextName );
+TFLOGSTRING2( "TSY: CMmPacketContextTsy::GetDataVolumeTransferredL. Context name:%S", &iContextName );
 
     TInt ret( KErrNone );
 
@@ -1082,7 +1081,7 @@
 void CMmPacketContextTsy::CompleteGetDataVolumeTransferred( 
         const TInt aResult )  
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTTSY_COMPLETEGETDATAVOLUMETRANSFERRED_1,  "TSY: CMmPacketContextTsy::CompleteGetDataVolumeTransferred. Error: %d", aResult );
+TFLOGSTRING2( "TSY: CMmPacketContextTsy::CompleteGetDataVolumeTransferred. Error: %d", aResult );
 
     // Reset the req handle. Returns the deleted req handle
     TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle(
@@ -1115,7 +1114,8 @@
         const TTsyReqHandle aTsyReqHandle,  
         TInt* const aError )    
     {
-OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTTSY_GETLASTERRORCAUSE_1,  "TSY: CMmPacketContextTsy::GetLastErrorCause. Context name:%S Last error cause: %d",iContextName, iLastErrorCause );
+TFLOGSTRING3( "TSY: CMmPacketContextTsy::GetLastErrorCause. Context name:%S Last error cause: %d",
+             &iContextName, iLastErrorCause );
 
     *aError = iLastErrorCause;
     CMmPacketContextTsy::ReqCompleted( aTsyReqHandle, KErrNone );
@@ -1145,7 +1145,8 @@
         aQoSProfile->Zero();
         }
 
-OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTTSY_GETPROFILENAME_1,  "TSY: CMmPacketContextTsy::GetProfileName. Context name: %S QoS Profile Name: %S",iContextName, *aQoSProfile );
+TFLOGSTRING3( "TSY: CMmPacketContextTsy::GetProfileName. Context name: %S QoS Profile Name: %S",
+             &iContextName, aQoSProfile );
 
     CMmPacketContextTsy::ReqCompleted( aTsyReqHandle, KErrNone );
     return KErrNone;
@@ -1161,7 +1162,8 @@
         const TTsyReqHandle aTsyReqHandle,   
         RPacketContext::TContextStatus* const aContextStatus )
     {
-OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTTSY_GETSTATUS_1,  "TSY: CMmPacketContextTsy::GetStatus. Context name: %S Context Status:%d",iContextName, iContextStatus );
+TFLOGSTRING3( "TSY: CMmPacketContextTsy::GetStatus. Context name: %S Context Status:%d",
+             &iContextName, iContextStatus );
     *aContextStatus = iContextStatus;
     CMmPacketContextTsy::ReqCompleted( aTsyReqHandle, KErrNone );
 
@@ -1177,7 +1179,7 @@
 TInt CMmPacketContextTsy::NotifyConfigChanged(
         TPacketDataConfigBase* const aConfig )  
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTTSY_NOTIFYCONFIGCHANGED_1,  "TSY: CMmPacketContextTsy::NotifyConfigChanged." );
+TFLOGSTRING( "TSY: CMmPacketContextTsy::NotifyConfigChanged." );
 
     // Call NotifyConfigChanged from extension
     TInt ret = iMmPacketContextGsmWcdmaExt->NotifyConfigChanged( *aConfig );
@@ -1212,7 +1214,8 @@
 //
 void CMmPacketContextTsy::CompleteNotifyConfigChanged()
     {
-OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTTSY_COMPLETENOTIFYCONFIGCHANGED_1,  "TSY: CMmPacketContextTsy::CompleteNotifyConfigChanged.  Context name:%S",iContextName );
+TFLOGSTRING2( "TSY: CMmPacketContextTsy::CompleteNotifyConfigChanged.  Context name:%S",
+                &iContextName );
 
     // Get and reset req handle for R97/98 config notify
     TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle(
@@ -1252,7 +1255,7 @@
 TInt CMmPacketContextTsy::NotifyConnectionSpeedChange(
         TUint* const aRate )    
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTTSY_NOTIFYCONNECTIONSPEEDCHANGE_1,  "TSY: CMmPacketContextTsy::NotifyConnectionSpeedChange." );
+TFLOGSTRING( "TSY: CMmPacketContextTsy::NotifyConnectionSpeedChange." );
 
     // Store pointer
     iRetNotifyConnectionSpeed = aRate;
@@ -1275,7 +1278,8 @@
     
     if ( iNotifyConnectionSpeed != iConnectionSpeed )
         {
-OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTTSY_COMPLETENOTIFYCONNECTIONSPEEDCHANGE_1,  "TSY: CMmPacketContextTsy::CompleteNotifyConnectionSpeedChange. Context name:%S Connection Speed:%u bps",iContextName, iConnectionSpeed );
+TFLOGSTRING3( "TSY: CMmPacketContextTsy::CompleteNotifyConnectionSpeedChange. Context name:%S Connection Speed:%d bps",
+            &iContextName, iConnectionSpeed );
 
         // Store the connection speed internally
         iNotifyConnectionSpeed = iConnectionSpeed;
@@ -1305,7 +1309,7 @@
 TInt CMmPacketContextTsy::NotifyStatusChange(
         RPacketContext::TContextStatus* const aContextStatus )
     {
-OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTTSY_NOTIFYSTATUSCHANGE_1,  "TSY: CMmPacketContextTsy::NotifyStatusChange. Context name:%S", iContextName );
+TFLOGSTRING2( "TSY: CMmPacketContextTsy::NotifyStatusChange. Context name:%S", &iContextName );
     iRetNotifyStatus = aContextStatus;
     iReqHandleType = EMultimodePacketContextNotifyStatusChange;
 
@@ -1325,7 +1329,8 @@
     if ( aContextStatus != iContextStatus )
         {
         iContextStatus = aContextStatus;
-OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTTSY_COMPLETENOTIFYSTATUSCHANGE_1,  "TSY: CMmPacketContextTsy::CompleteNotifyStatusChange. Context name: %S  Context status:%d",iContextName, iContextStatus );
+TFLOGSTRING3( "TSY: CMmPacketContextTsy::CompleteNotifyStatusChange. Context name: %S  Context status:%d",
+                    &iContextName, iContextStatus );
 
         if ( RPacketContext::EStatusActive == iContextStatus ||
              RPacketContext::EStatusInactive == iContextStatus ||
@@ -1364,7 +1369,7 @@
 TInt CMmPacketContextTsy::SetConfigL(
         TPacketDataConfigBase* const aConfig ) 
     {
-OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTTSY_SETCONFIGL_1,  "TSY: CMmPacketContextTsy::SetConfigL. Context name:%S", iContextName );
+TFLOGSTRING2( "TSY: CMmPacketContextTsy::SetConfigL. Context name:%S", &iContextName );
 
     // Call SetConfigL
     TInt ret = iMmPacketContextGsmWcdmaExt->SetConfigL( aConfig );
@@ -1388,7 +1393,7 @@
         const TInt aError,   
         TBool aIsAddMediaAuthorizationCalled )
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTTSY_COMPLETESETCONFIG_1,  "TSY: CMmPacketContextTsy::CompleteSetConfig. Error: %d", aError );
+TFLOGSTRING2( "TSY: CMmPacketContextTsy::CompleteSetConfig. Error: %d", aError );
     
     TTsyReqHandle reqHandle( EMultimodePacketContextReqHandleUnknown );
     //if context exists eg. its name length is bigger than zero
@@ -1477,7 +1482,7 @@
         RPacketContext::TDataVolume dataVolume )
     {
 
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTTSY_SETDATAVOLUME_1,  "TSY: CMmPacketContextTsy::SetDataVolume" );
+TFLOGSTRING( "TSY: CMmPacketContextTsy::SetDataVolume" );
    
     if ( dataVolume.iBytesSent < iDataVolume.iBytesSent )
         {
@@ -1511,7 +1516,8 @@
         iLastErrorCause =  aErrorCause;           
         }
 
-OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTTSY_SETLASTERRORCAUSE_1,  "TSY: CMmPacketContextTsy::SetLastErrorCause.  aErrorCause: %d iLastErrorCause:%d", aErrorCause, iLastErrorCause );
+TFLOGSTRING3( "TSY: CMmPacketContextTsy::SetLastErrorCause.  aErrorCause: %d iLastErrorCause:%d", 
+             aErrorCause, iLastErrorCause );
 
     }
 
@@ -1534,7 +1540,8 @@
 //
 void CMmPacketContextTsy::ContextSuspended()
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTTSY_CONTEXTSUSPENDED_1,  "TSY: CMmPacketContextTsy::ContextSuspended. Context status before suspending: %d",iContextStatus );
+TFLOGSTRING2( "TSY: CMmPacketContextTsy::ContextSuspended. Context status before suspending: %d",
+                iContextStatus );
 
     if ( ( RPacketContext::EStatusActivating == iContextStatus ) ||
          ( RPacketContext::EStatusActive == iContextStatus ) ||
@@ -1562,7 +1569,8 @@
 
     iContextStatusBeforeSuspending = RPacketContext::EStatusUnknown;
 
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTTSY_CONTEXTRESUMED_1,  "TSY: CMmPacketContextTsy::ContextResumed. Context status when resumed: %d",iContextStatus );
+TFLOGSTRING2( "TSY: CMmPacketContextTsy::ContextResumed. Context status when resumed: %d",
+                iContextStatus );
 
     }
 
@@ -1596,7 +1604,7 @@
 //
 void CMmPacketContextTsy::RemoveQoS()
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTTSY_REMOVEQOS_1,  "TSY: CMmPacketContextTsy::RemoveQoS." );
+TFLOGSTRING( "TSY: CMmPacketContextTsy::RemoveQoS." );
 
     iQoSProfile = NULL;
     iQoSProfileName.Zero();
@@ -1612,7 +1620,8 @@
         const TTsyReqHandle aTsyReqHandle, 
         const TInt aError )   
     {
-OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTTSY_REQCOMPLETED_1,  "TSY: CMmPacketContextTsy::ReqCompleted. Handle:%d Error:%d", aTsyReqHandle, aError );
+TFLOGSTRING3( "TSY: CMmPacketContextTsy::ReqCompleted. Handle:%d Error:%d", 
+             aTsyReqHandle, aError );
 
     // Set last error cause
     if ( KErrNone != aError )
@@ -1778,7 +1787,7 @@
 void CMmPacketContextTsy::ResetDialUpContext()
     {
 
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTTSY_RESETDIALUPCONTEXT_1,  "TSY: CMmPacketContextTsy::ResetDialUpContext." );
+TFLOGSTRING( "TSY: CMmPacketContextTsy::ResetDialUpContext." );
 
     iDataVolume.iOverflowCounterSent = 0;
     iDataVolume.iBytesSent = 0;
@@ -1814,7 +1823,7 @@
         const TTsyReqHandle aTsyReqHandle,  
         TDes8* const aPacketFilter )  
     {
-OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTTSY_ADDPACKETFILTERL_1,  "TSY: CMmPacketContextTsy::AddPacketFilterL. Context name:%S", iContextName );
+TFLOGSTRING2( "TSY: CMmPacketContextTsy::AddPacketFilterL. Context name:%S", &iContextName );
 
     TInt ret( KErrGeneral );
 
@@ -1856,7 +1865,7 @@
         const TTsyReqHandle aTsyReqHandle,  
         TInt *aID ) 
     {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTTSY_REMOVEPACKETFILTER_1,  "TSY: CMmPacketContextTsy::RemovePacketFilter. RemovedFilter:%d", *aID );
+TFLOGSTRING2( "TSY: CMmPacketContextTsy::RemovePacketFilter. RemovedFilter:%d", *aID );
 
     TInt ret( KErrArgument );
 
@@ -1881,7 +1890,7 @@
 //
 TInt CMmPacketContextTsy::ModifyActiveContextL()
     {
-OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTTSY_MODIFYACTIVECONTEXTL_1,  "TSY: CMmPacketContextTsy::ModifyActiveContextL. Context name:%S", iContextName );
+TFLOGSTRING2( "TSY: CMmPacketContextTsy::ModifyActiveContextL. Context name:%S", &iContextName );
     
     TInt ret( KErrNotReady );
 
@@ -1910,7 +1919,7 @@
 void CMmPacketContextTsy::CompleteModifyActiveContext(
         const TInt aResult )
     {
-OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTTSY_COMPLETEMODIFYACTIVECONTEXT_1,  "TSY: CMmPacketContextTsy::CompleteModifyActiveContext. Context name:%S", iContextName );
+TFLOGSTRING2( "TSY: CMmPacketContextTsy::CompleteModifyActiveContext. Context name:%S", &iContextName );
 
     TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle(
            EMultimodePacketContextModifyActiveContext );
@@ -2109,7 +2118,7 @@
         const TTsyReqHandle aTsyReqHandle,    
         TConnectionInfoBase* const aInfo )  
     {
-OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTTSY_GETCONNECTIONINFO_1,  "TSY: CMmPacketContextTsy::GetConnectionInfo. Context name:%S", iContextName );
+TFLOGSTRING2( "TSY: CMmPacketContextTsy::GetConnectionInfo. Context name:%S", &iContextName );
 
     // Get config
     TInt ret = FillConnectionInfo( aInfo );
@@ -2129,7 +2138,7 @@
 TInt CMmPacketContextTsy::NotifyConnectionInfoChange(
         TConnectionInfoBase* const aInfo )    
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTTSY_NOTIFYCONNECTIONINFOCHANGE_1,  "TSY: CMmPacketContextTsy::NotifyConnectionInfoChange." );
+TFLOGSTRING( "TSY: CMmPacketContextTsy::NotifyConnectionInfoChange." );
 
     // Store pointer
     iRetNotifyConnectionInfo = aInfo;
@@ -2148,7 +2157,7 @@
 void CMmPacketContextTsy::CompleteNotifyConnectionInfoChange(
         TConnectionInfoBase* const aInfo )    
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTTSY_COMPLETENOTIFYCONNECTIONINFOCHANGE_1,  "TSY: CMmPacketContextTsy::CompleteNotifyConnectionInfoChange." );
+TFLOGSTRING( "TSY: CMmPacketContextTsy::CompleteNotifyConnectionInfoChange." );
 
     if ( NULL != aInfo &&
         TConnectionInfoBase::KConnectionInfoV1 == aInfo->ExtensionId() )
@@ -2197,7 +2206,7 @@
 TInt CMmPacketContextTsy::FillConnectionInfo(   
         TConnectionInfoBase* const aInfo )  
     {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETCONTEXTTSY_FILLCONNECTIONINFO_1,  "TSY: CMmPacketContextTsy::FillConnectionInfo" );
+TFLOGSTRING( "TSY: CMmPacketContextTsy::FillConnectionInfo" );
 
     TInt ret = KErrNone;