FCL/sf/os/cellularsrv: comparison telephonyserverplugins/common_tsy/commontsy/src/mmpacket/Cmmpacketservicetsy.cpp

equal deleted inserted replaced

-:17af172ffa5f
+:630d2f34d719
-// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2006-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"
 // which accompanies this distribution, and is available
 // at the URL "http://www.eclipse.org/legal/epl-v10.html".
 //
 //  INCLUDE FILES
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "CmmpacketservicetsyTraces.h"
+#endif
 #include "Cmmpacketservicetsy.h"
-#include <ctsy/tflogger.h>
 #include <ctsy/serviceapi/mmtsy_defaults.h>
 #include "MmTsy_timeoutdefs.h"
 #include "MmTsy_numberOfSlots.h"
 #include "CMmCommonStaticUtility.h"
 #include "Cmmpacketcontextlist.h"
 CMmPacketServiceTsy* CMmPacketServiceTsy::NewL(
 CMmPhoneTsy* const aMmPhone,
 CMmMessageManagerBase* const aMessageManager,
 MLtsyFactoryBase* aFactory  )
 {
-TFLOGSTRING("TSY: CMmPacketServiceTsy::NewL" );
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_NEWL_1, "TSY: CMmPacketServiceTsy::NewL" );
 CMmPacketServiceTsy* const packetService =
 new ( ELeave ) CMmPacketServiceTsy();
 CleanupClosePushL( *packetService );
 packetService->iMmPhone = aMmPhone;
 	packetService->iMessageManager = aMessageManager;
 packetService->ConstructL( aFactory );
 CleanupStack::Pop();
-TFLOGSTRING("TSY: CMmPacketServiceTsy::NewL." );
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_NEWL_2, "TSY: CMmPacketServiceTsy::NewL." );
 return packetService;
 }
 void CMmPacketServiceTsy::ConstructL( MLtsyFactoryBase* aFactory )
 }
 CMmPacketServiceTsy::~CMmPacketServiceTsy()
 {
-TFLOGSTRING("TSY: CMmPacketServiceTsy::~CMmPacketServiceTsy" );
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_DTOR_1, "TSY: CMmPacketServiceTsy::~CMmPacketServiceTsy" );
 if ( iMmPhone )
 {
 // deregister tsy object from message manager
 iMmPhone->MessageManager()->DeregisterTsyObject(this);
 	delete iGetMbmsMonitoredServiceLists;
 	}
 if ( NULL != iDialUpContext )
 {
-TFLOGSTRING("TSY: CMmPacketServiceTsy::~CMmPacketServiceTsy: Close Dial-up Object." );
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_DTOR_2, "TSY: CMmPacketServiceTsy::~CMmPacketServiceTsy: Close Dial-up Object." );
 iDialUpContext->Close();
 }
 if ( NULL != iSecondaryDialUpContext )
 {
-TFLOGSTRING("TSY: CMmPacketServiceTsy::~CMmPacketServiceTsy: Close Secondary Dial-up Object." );
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_DTOR_3, "TSY: CMmPacketServiceTsy::~CMmPacketServiceTsy: Close Secondary Dial-up Object." );
 iSecondaryDialUpContext->Close();
 }
-TFLOGSTRING("TSY: CMmPacketServiceTsy::~CMmPacketServiceTsy: Closing iMutex Object." );
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_DTOR_4, "TSY: CMmPacketServiceTsy::~CMmPacketServiceTsy: Closing iMutex Object." );
 iMutex.Close();
 #ifdef USING_CTSY_DISPATCHER
 //CTSY defect (memory leak) this maybe allocated, but it is never deleted.
 //no need for NULL check as C++ guarantees that operator delete checks its argument for null-ness.
 // set service status EStatusAttached
 		CMmPacketServiceTsy::CompleteNotifyStatusChange(
 		    RPacketService::EStatusAttached, KErrNone );
 }
-TFLOGSTRING2("TSY: CMmPacketServiceTsy::UpdateAttachedPacketStatus. Service Status: %d", iInternalSavedData.iServiceStatus );
+OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_UPDATEATTACHEDPACKETSTATUS_1, "TSY: CMmPacketServiceTsy::UpdateAttachedPacketStatus. Service Status: %d", iInternalSavedData.iServiceStatus );
 }
 //----------------------------------------------------------------------------
 // CMmPacketServiceTsy::CompletePacketStatusChanged
 // Called from active extension to notify service that transfer status
 }
 }
 if ( iDialUpContext != NULL )
 {
-TFLOGSTRING("TSY: CMmPacketServiceTsy::CompletePacketStatusChanged.  DialUp Context Resumed" );
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_COMPLETEPACKETSTATUSCHANGED_1, "TSY: CMmPacketServiceTsy::CompletePacketStatusChanged.  DialUp Context Resumed" );
 iDialUpContext->ContextResumed();
 }
 if ( iSecondaryDialUpContext != NULL )
 {
-TFLOGSTRING("TSY: CMmPacketServiceTsy::CompletePacketStatusChanged. Secondary DialUp Context Resumed" );
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_COMPLETEPACKETSTATUSCHANGED_2, "TSY: CMmPacketServiceTsy::CompletePacketStatusChanged. Secondary DialUp Context Resumed" );
 iSecondaryDialUpContext->ContextResumed();
 }
 // Get service status before suspend
 }
 }
 if ( iDialUpContext != NULL )
 {
-TFLOGSTRING("TSY: CMmPacketServiceTsy::CompletePacketStatusChanged.  DialUp Context Suspended" );
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_COMPLETEPACKETSTATUSCHANGED_3, "TSY: CMmPacketServiceTsy::CompletePacketStatusChanged.  DialUp Context Suspended" );
 iDialUpContext->ContextSuspended();
 }
 if ( iSecondaryDialUpContext != NULL )
 {
-TFLOGSTRING("TSY: CMmPacketServiceTsy::CompletePacketStatusChanged.  DialUp Context Suspended" );
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_COMPLETEPACKETSTATUSCHANGED_4, "TSY: CMmPacketServiceTsy::CompletePacketStatusChanged.  DialUp Context Suspended" );
 iSecondaryDialUpContext->ContextSuspended();
 }
 // Complete status change notification with
 // EStatusSuspended
 break;
 default:
 break;
 }
 }
-TFLOGSTRING2("TSY: CMmPacketServiceTsy::CompletePacketStatusChanged. Service Status: %d", iInternalSavedData.iServiceStatus );
+OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_COMPLETEPACKETSTATUSCHANGED_5, "TSY: CMmPacketServiceTsy::CompletePacketStatusChanged. Service Status: %d", iInternalSavedData.iServiceStatus );
 }
 //----------------------------------------------------------------------------
 // CMmPacketServiceTsy::ContextStatusChanged
 // Context status is changed from the Service point of view.
 //----------------------------------------------------------------------------
 //
 void CMmPacketServiceTsy::ContextStatusChanged(
 const RPacketContext::TContextStatus aContextStatus )
 {
-TFLOGSTRING2("TSY: CMmPacketServiceTsy::ContextStatusChanged. Context Status: %d", aContextStatus );
+OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_CONTEXTSTATUSCHANGED_1, "TSY: CMmPacketServiceTsy::ContextStatusChanged. Context Status: %d", aContextStatus );
 if ( !iSuspended && ( RPacketService::EStatusUnattached !=
 iInternalSavedData.iServiceStatus ) )
 {
 {
 	RPacketService::TPreferredBearer preferredBearer;
 	aPackage->UnPackData( preferredBearer );
-TFLOGSTRING2("TSY: CMmPacketServiceTsy::PreferredBearerChanged. PreferredBearer: %d", preferredBearer );
+OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_PREFERREDBEARERCHANGED_1, "TSY: CMmPacketServiceTsy::PreferredBearerChanged. PreferredBearer: %d", preferredBearer );
 iInternalSavedData.iPreferredBearer = preferredBearer;
 }
 // KErrAlreadyExists should be returned.
 //----------------------------------------------------------------------------
 //
 TInt CMmPacketServiceTsy::AttachL()
 {
-TFLOGSTRING("TSY: CMmPacketServiceTsy::AttachL." );
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_ATTACHL_1, "TSY: CMmPacketServiceTsy::AttachL." );
 TInt ret( KErrAlreadyExists );
 if ( RPacketService::EStatusUnattached ==
 iInternalSavedData.iServiceStatus )
 //----------------------------------------------------------------------------
 //
 void CMmPacketServiceTsy::CompleteAttach(
 const TInt aError )  //error value
 {
-TFLOGSTRING2("TSY: CMmPacketServiceTsy::CompleteAttach. Error Value: %d", aError );
+OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_COMPLETEATTACH_1, "TSY: CMmPacketServiceTsy::CompleteAttach. Error Value: %d", aError );
 // Reset request handle. Returns the deleted request handle
 const TTsyReqHandle reqHandle( iTsyReqHandleStore->ResetTsyReqHandle(
 EMultimodePacketServiceAttach ) );
 // error KErrInUse should be returned.
 //----------------------------------------------------------------------------
 //
 TInt CMmPacketServiceTsy::DetachL()
 {
-TFLOGSTRING("TSY: CMmPacketServiceTsy::DetachL." );
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_DETACHL_1, "TSY: CMmPacketServiceTsy::DetachL." );
 TInt ret( KErrAlreadyExists );
 if ( RPacketService::EStatusUnattached !=
 iInternalSavedData.iServiceStatus )
 //----------------------------------------------------------------------------
 //
 void CMmPacketServiceTsy::CompleteDetachL(
 const TInt aError )
 {
-TFLOGSTRING2("TSY: CMmPacketServiceTsy::CompleteDetachL. Error Value: %d", aError );
+OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_COMPLETEDETACHL_1, "TSY: CMmPacketServiceTsy::CompleteDetachL. Error Value: %d", aError );
 // Reset request handle. Returns the deleted request handle
 const TTsyReqHandle reqHandle( iTsyReqHandleStore->ResetTsyReqHandle(
 EMultimodePacketServiceDetach ) );
 TInt* const aMaxAllowed )
 {
 *aCount = iPacketContextList->NumberOfContexts();
 *aMaxAllowed = KMmMaxNumberOfContexts;
-TFLOGSTRING3("TSY: CMmPacketServiceTsy::EnumerateContexts. Count: %d Max Allowed: %d", *aCount, *aMaxAllowed );
+OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_ENUMERATECONTEXTS_1, "TSY: CMmPacketServiceTsy::EnumerateContexts. Count: %d Max Allowed: %d", *aCount, *aMaxAllowed );
 // Complete the request with KErrNone
 CMmPacketServiceTsy::ReqCompleted( iTsyReqHandle, KErrNone );
 return KErrNone;
 }
 //----------------------------------------------------------------------------
 //
 TInt CMmPacketServiceTsy::GetAttachModeL(
 RPacketService::TAttachMode* const aMode )
 {
-TFLOGSTRING2("TSY: CMmPacketServiceTsy::GetAttachModeL. Mode:%d", *aMode );
+OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_GETATTACHMODEL_1, "TSY: CMmPacketServiceTsy::GetAttachModeL. Mode:%d", *aMode );
 TInt ret( KErrServerBusy );
 const TTsyReqHandle reqHandle( iTsyReqHandleStore->GetTsyReqHandle(
 EMultimodePacketServiceGetAttachMode ) );
 //----------------------------------------------------------------------------
 //
 void CMmPacketServiceTsy::CompleteGetAttachMode(
 const RPacketService::TAttachMode aAttachMode, TInt aResult )
 {
-TFLOGSTRING2("TSY: CMmPacketServiceTsy::CompleteGetAttachMode. Attach Mode: %d", aAttachMode );
+OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_COMPLETEGETATTACHMODE_1, "TSY: CMmPacketServiceTsy::CompleteGetAttachMode. Attach Mode: %d", aAttachMode );
 // Reset request handle. Returns the deleted request handle
 const TTsyReqHandle reqHandle( iTsyReqHandleStore->ResetTsyReqHandle(
 EMultimodePacketServiceGetAttachMode ) );
 {
 // Call GetContextNameByIndex() to set context name to aInfo->iName
 ret = iPacketContextList->GetContextNameByIndex(
 *aIndex, aInfo->iName );
-TFLOGSTRING3("TSY: CMmPacketServiceTsy::GetContextInfo. Context Status: %d Context Name: %S", aInfo->iStatus, &aInfo->iName );
+OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_GETCONTEXTINFO_1, "TSY: CMmPacketServiceTsy::GetContextInfo. Context Status: %d Context Name: %S", aInfo->iStatus, aInfo->iName );
 }
 // Complete request with ret
 CMmPacketServiceTsy::ReqCompleted( iTsyReqHandle, ret );
 TInt CMmPacketServiceTsy::GetDynamicCaps(
 RPacketService::TDynamicCapsFlags* const aCaps )
 {
 // Call DynamicCaps() from extension
 iMmPacketServiceGsmWcdmaExt->GetDynamicCaps( aCaps );
-TFLOGSTRING("TSY: CMmPacketServiceTsy::GetDynamicCaps." );
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_GETDYNAMICCAPS_1, "TSY: CMmPacketServiceTsy::GetDynamicCaps." );
 // Complete the request with KErrNone
 CMmPacketServiceTsy::ReqCompleted( iTsyReqHandle, KErrNone );
 return KErrNone;
 RPacketService::TMSClass* const aCurrentClass,
 RPacketService::TMSClass* const aMaxClass )
 {
 *aCurrentClass = iInternalSavedData.iMsClass;
 *aMaxClass = KMaxMsClass;
-TFLOGSTRING3("TSY: CMmPacketServiceTsy::GetMSClass. Current Class: %d Max Class: %d", *aCurrentClass, *aMaxClass );
+OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_GETMSCLASS_1, "TSY: CMmPacketServiceTsy::GetMSClass. Current Class: %d Max Class: %d", *aCurrentClass, *aMaxClass );
 // Complete the request with KErrNone
 CMmPacketServiceTsy::ReqCompleted( iTsyReqHandle, KErrNone );
 return KErrNone;
 //------------------------------------------------------------------------------
 //
 TInt CMmPacketServiceTsy::GetNtwkRegStatusL(
 RPacketService::TRegistrationStatus* const aRegistrationStatus )
 {
-TFLOGSTRING2("TSY: CMmPacketServiceTsy::GetNtwkRegStatusL. Tsy Req Handle: %d", iTsyReqHandle );
+OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_GETNTWKREGSTATUSL_1, "TSY: CMmPacketServiceTsy::GetNtwkRegStatusL. Tsy Req Handle: %d", iTsyReqHandle );
 const TTsyReqHandle regHandle( iTsyReqHandleStore->GetTsyReqHandle(
 EMultimodePacketServiceGetNtwkRegStatus ) );
 TInt ret( KErrServerBusy );
 {
 // Request was sent during initialisation from active extension
 CMmPacketServiceTsy::CompleteNotifyChangeOfNtwkRegStatus(
 												aRegistrationStatus );
 }
-TFLOGSTRING3("TSY: CMmPacketServiceTsy::CompleteGetNtwkRegStatus. TSY Req Handle: %d Registration Status: %d", reqHandle, aRegistrationStatus );
+OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_COMPLETEGETNTWKREGSTATUS_1, "TSY: CMmPacketServiceTsy::CompleteGetNtwkRegStatus. TSY Req Handle: %d Registration Status: %d", reqHandle, aRegistrationStatus );
 }
 //----------------------------------------------------------------------------
 // CMmPacketServiceTsy::GetPreferredBearer
 // Returns preferred bearer.
 //
 TInt CMmPacketServiceTsy::GetPreferredBearer(
 RPacketService::TPreferredBearer* const aBearer )
 {
 *aBearer = iInternalSavedData.iPreferredBearer;
-TFLOGSTRING2("TSY: CMmPacketServiceTsy::GetPreferredBearer. Preferred Bearer: %d", *aBearer );
+OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_GETPREFERREDBEARER_1, "TSY: CMmPacketServiceTsy::GetPreferredBearer. Preferred Bearer: %d", *aBearer );
 // Complete the request with KErrNone
 CMmPacketServiceTsy::ReqCompleted( iTsyReqHandle, KErrNone );
 return KErrNone;
 case RPacketContext::EPdpTypeIPv6:
 case RPacketContext::EPdpTypeX25:
 case RPacketContext::EPdpTypePPP:
 case RPacketContext::EPdpTypeCDPD:
 iMmPacketServiceGsmWcdmaExt->GetStaticCaps( aCaps );
-TFLOGSTRING("TSY: CMmPacketServiceTsy::GetStaticCaps." );
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_GETSTATICCAPS_1, "TSY: CMmPacketServiceTsy::GetStaticCaps." );
 // Complete the request with KErrNone
 CMmPacketServiceTsy::ReqCompleted( iTsyReqHandle, ret );
 break;
 default:
 TInt CMmPacketServiceTsy::GetStatus(
 RPacketService::TStatus* const aPacketStatus )
 {
 *aPacketStatus = iInternalSavedData.iServiceStatus;
-TFLOGSTRING2("TSY: CMmPacketServiceTsy::GetStatus. Service Status: %d", *aPacketStatus );
+OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_GETSTATUS_1, "TSY: CMmPacketServiceTsy::GetStatus. Service Status: %d", *aPacketStatus );
 // Complete the request with KErrNone
 CMmPacketServiceTsy::ReqCompleted( iTsyReqHandle, KErrNone );
 return KErrNone;
 //----------------------------------------------------------------------------
 //
 TInt CMmPacketServiceTsy::NotifyChangeOfNtwkRegStatus(
 RPacketService::TRegistrationStatus* const aRegistrationStatus )
 {
-TFLOGSTRING("TSY: CMmPacketServiceTsy::NotifyChangeOfNtwkRegStatus." );
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_NOTIFYCHANGEOFNTWKREGSTATUS_1, "TSY: CMmPacketServiceTsy::NotifyChangeOfNtwkRegStatus." );
 // Set request handle and save pointer to aRegistrationStatus
 iNotifyDataPointers.iChangeOfNtwkRegStatus = aRegistrationStatus;
 iReqHandleType =  EMultimodePacketServiceNotifyNtwkRegStatusChange;
 //----------------------------------------------------------------------------
 //
 void CMmPacketServiceTsy::CompleteNotifyChangeOfNtwkRegStatus(
 const RPacketService::TRegistrationStatus aRegistrationStatus )
 {
-TFLOGSTRING3("TSY: CMmPacketServiceTsy::CompleteNotifyChangeOfNtwkRegStatus. Current reg Status: %d New reg Status: %d", iInternalSavedData.iRegistrationStatus, aRegistrationStatus );
+OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_COMPLETENOTIFYCHANGEOFNTWKREGSTATUS_1, "TSY: CMmPacketServiceTsy::CompleteNotifyChangeOfNtwkRegStatus. Current reg Status: %d New reg Status: %d", iInternalSavedData.iRegistrationStatus, aRegistrationStatus );
 // If registration status changed
 if ( aRegistrationStatus != iInternalSavedData.iRegistrationStatus )
 {
 // Save new status internally
 //----------------------------------------------------------------------------
 //
 void CMmPacketServiceTsy::CompleteNotifyChangeOfNtwkRegStatus(
 CMmDataPackage* aDataPackage, TInt aResult )
 {
-TFLOGSTRING("TSY: CMmPacketServiceTsy::CompleteNotifyChangeOfNtwkRegStatus.");
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_COMPLETENOTIFYCHANGEOFNTWKREGSTATUS1_1, "TSY: CMmPacketServiceTsy::CompleteNotifyChangeOfNtwkRegStatus.");
 	//Unpack necessary data from datapackage
 	RPacketService::TRegistrationStatus registrationStatus;
 	aDataPackage->UnPackData( registrationStatus );
 //----------------------------------------------------------------------------
 //
 TInt CMmPacketServiceTsy::NotifyContextActivationRequested(
 TPacketDataConfigBase* const aContextParameters )
 {
-TFLOGSTRING("TSY: CMmPacketServiceTsy::NotifyContextActivationRequested." );
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_NOTIFYCONTEXTACTIVATIONREQUESTED_1, "TSY: CMmPacketServiceTsy::NotifyContextActivationRequested." );
 TInt ret = KErrNone;
 // If class of aContextParameters is TContextConfigGPRS
 if ( TPacketDataConfigBase::KConfigGPRS ==
 //----------------------------------------------------------------------------
 //
 void CMmPacketServiceTsy::CompleteNotifyContextActivationRequested(
 CMmDataPackage* aDataPackage )		//contains initial data
 {
-TFLOGSTRING("TSY: CMmPacketServiceTsy::CompleteNotifyContextActivationRequested.");
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_COMPLETENOTIFYCONTEXTACTIVATIONREQUESTED_1, "TSY: CMmPacketServiceTsy::CompleteNotifyContextActivationRequested.");
 	//Check if there is client request
 	if ( EMultimodePacketServiceReqHandleUnknown !=
 			CMmPacketServiceTsy::TsyReqHandleStore()->GetTsyReqHandle(
 				CMmPacketServiceTsy::
 //----------------------------------------------------------------------------
 //
 TInt CMmPacketServiceTsy::NotifyContextAdded(
 const TDataPackage& aPackage )
 {
-TFLOGSTRING("TSY: CMmPacketServiceTsy::NotifyContextAdded." );
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_NOTIFYCONTEXTADDED_1, "TSY: CMmPacketServiceTsy::NotifyContextAdded." );
 	TDes* const context = aPackage.Des1u();
 // Save request handle type and context Name
 iReqHandleType = EMultimodePacketServiceNotifyContextAdded;
 TInt trapError( KErrNone );
 TInt ret( KErrNone );
 	aPackage->UnPackData( contextName, result  );
-TFLOGSTRING("TSY: CMmPacketServiceTsy::CompleteNotifyContextAdded." );
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_COMPLETENOTIFYCONTEXTADDED_1, "TSY: CMmPacketServiceTsy::CompleteNotifyContextAdded." );
 	if ( KErrNone != result )
 {
 //if one Dial-up context is created
 if ( iDialUpContext )
 {
 // External context, service has no control to the context.
 // Context name forced to External2.
 contextName.Copy( KStringExternal2 );
-TFLOGSTRING("TSY: CMmPacketServiceTsy::CompleteNotifyContextAdded :Create Secondary Dial-up Object." );
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_COMPLETENOTIFYCONTEXTADDED_2, "TSY: CMmPacketServiceTsy::CompleteNotifyContextAdded :Create Secondary Dial-up Object." );
 // Create object for externally created dial-up context
 TRAP( trapError, iSecondaryDialUpContext = CMmPacketContextTsy::NewL(
 this, tempHostCID, contextName ); );
 }
 {
 // External context, service has no control to the context.
 // Context name forced to External.
 contextName.Copy( KStringExternal );
-TFLOGSTRING("TSY: CMmPacketServiceTsy::CompleteNotifyContextAdded :Create Dial-up Object." );
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_COMPLETENOTIFYCONTEXTADDED_3, "TSY: CMmPacketServiceTsy::CompleteNotifyContextAdded :Create Dial-up Object." );
 // Create object for externally created dial-up context
 TRAP( trapError, iDialUpContext = CMmPacketContextTsy::NewL(
 this, tempHostCID, contextName ); );
 }
 	     	}
 //Check if dial-up context is created, and set default params
 if ( contextName.Compare( KStringExternal2 ) == 0 )
 {
-TFLOGSTRING("TSY: CMmPacketServiceTsy::CompleteNotifyContextAdded :Reset Secondary Dial-up Object." );
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_COMPLETENOTIFYCONTEXTADDED_4, "TSY: CMmPacketServiceTsy::CompleteNotifyContextAdded :Reset Secondary Dial-up Object." );
 // Reset secondary dial-up context
 if(iSecondaryDialUpContext)
 	{
 	iSecondaryDialUpContext->ResetDialUpContext();
 	}
 }
 else if ( contextName.Compare( KStringExternal ) == 0 )
 {
-TFLOGSTRING("TSY: CMmPacketServiceTsy::CompleteNotifyContextAdded :Reset Dial-up Object." );
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_COMPLETENOTIFYCONTEXTADDED_5, "TSY: CMmPacketServiceTsy::CompleteNotifyContextAdded :Reset Dial-up Object." );
 // Reset dial-up context
 if(iDialUpContext)
 	{
 	iDialUpContext->ResetDialUpContext();
 	}
 if ( EMultimodePacketServiceReqHandleUnknown != reqHandle )
 {
 // Add context name to the etel side memory
 *iNotifyDataPointers.iContextAdded = contextName;
 iNotifyDataPointers.iContextAdded = NULL;
-TFLOGSTRING2("TSY: CMmPacketServiceTsy::CompleteNotifyContextAdded. Context Name: %S", &contextName );
+OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_COMPLETENOTIFYCONTEXTADDED_6, "TSY: CMmPacketServiceTsy::CompleteNotifyContextAdded. Context Name: %S", contextName );
 // Complete request with KErrNone
 CMmPacketServiceTsy::ReqCompleted( reqHandle, KErrNone );
 }
 }
 //----------------------------------------------------------------------------
 //
 TInt CMmPacketServiceTsy::NotifyDynamicCapsChange(
 RPacketService::TDynamicCapsFlags* const aCaps )
 {
-TFLOGSTRING("TSY: CMmPacketServiceTsy::NotifyDynamicCapsChange." );
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_NOTIFYDYNAMICCAPSCHANGE_1, "TSY: CMmPacketServiceTsy::NotifyDynamicCapsChange." );
 // Save pointer to aCaps
 iNotifyDataPointers.iDynamicCapsChange = aCaps;
 // Set request handle type
 //----------------------------------------------------------------------------
 //
 void CMmPacketServiceTsy::CompleteNotifyDynamicCapsChange(
 const RPacketService::TDynamicCapsFlags aCaps )
 {
-TFLOGSTRING("TSY: CMmPacketServiceTsy::CompleteNotifyDynamicCapsChange." );
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_COMPLETENOTIFYDYNAMICCAPSCHANGE_1, "TSY: CMmPacketServiceTsy::CompleteNotifyDynamicCapsChange." );
 // Reset request handle. Returns the deleted request handle
 const TTsyReqHandle reqHandle( iTsyReqHandleStore->ResetTsyReqHandle(
 EMultimodePacketServiceNotifyDynamicCapsChange ) );
 //----------------------------------------------------------------------------
 //
 TInt CMmPacketServiceTsy::NotifyMSClassChange(
 RPacketService::TMSClass* const aNewClass )
 {
-TFLOGSTRING("TSY: CMmPacketServiceTsy::NotifyMSClassChange." );
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_NOTIFYMSCLASSCHANGE_1, "TSY: CMmPacketServiceTsy::NotifyMSClassChange." );
 // Save aNewClass internally
 iNotifyDataPointers.iMSClassChange = aNewClass;
 iReqHandleType = EMultimodePacketServiceNotifyMSClassChange;
 //----------------------------------------------------------------------------
 //
 void CMmPacketServiceTsy::CompleteNotifyMSClassChange(
 CMmDataPackage* aDataPackage )
 {
-TFLOGSTRING("TSY: CMmPacketServiceTsy::CompleteNotifyMSClassChange." );
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_COMPLETENOTIFYMSCLASSCHANGE_1, "TSY: CMmPacketServiceTsy::CompleteNotifyMSClassChange." );
 	RPacketService::TMSClass newClass;
 	aDataPackage->UnPackData( newClass );
 if ( newClass != iInternalSavedData.iMsClass )
 {
 // Save changed MS Class to ETel side memory
 *iNotifyDataPointers.iMSClassChange = newClass;
 iNotifyDataPointers.iMSClassChange = NULL;
-TFLOGSTRING2("TSY: CMmPacketServiceTsy::CompleteNotifyMSClassChange. New Ms Class: %d", newClass );
+OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_COMPLETENOTIFYMSCLASSCHANGE_2, "TSY: CMmPacketServiceTsy::CompleteNotifyMSClassChange. New Ms Class: %d", newClass );
 // Complete request with KErrNone
 CMmPacketServiceTsy::ReqCompleted( reqHandle, KErrNone );
 }
 }
 }
 //----------------------------------------------------------------------------
 //
 TInt CMmPacketServiceTsy::NotifyStatusChange(
 RPacketService::TStatus* const aPacketStatus )
 {
-TFLOGSTRING("TSY: CMmPacketServiceTsy::NotifyStatusChange." );
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_NOTIFYSTATUSCHANGE_1, "TSY: CMmPacketServiceTsy::NotifyStatusChange." );
 // Save aPacketStatus to internal memory
 iNotifyDataPointers.iStatusChange = aPacketStatus;
 // Set request handle type
 //
 void CMmPacketServiceTsy::CompleteNotifyStatusChange(
 const RPacketService::TStatus& aPacketStatus,
 TInt aErrorCode )
 {
-TFLOGSTRING("TSY: CMmPacketServiceTsy::CompleteNotifyStatusChange." );
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_COMPLETENOTIFYSTATUSCHANGE_1, "TSY: CMmPacketServiceTsy::CompleteNotifyStatusChange." );
 if ( aPacketStatus != iInternalSavedData.iServiceStatus )
 {
 iInternalSavedData.iServiceStatus = aPacketStatus;
 // Reset req handle. Returns the deleted req handle
 if ( EMultimodePacketServiceReqHandleUnknown != reqHandle )
 {
 *iNotifyDataPointers.iStatusChange = aPacketStatus;
 iNotifyDataPointers.iStatusChange = NULL;
-TFLOGSTRING2("TSY: CMmPacketServiceTsy::CompleteNotifyStatusChange. Service Status:%d", aPacketStatus );
+OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_COMPLETENOTIFYSTATUSCHANGE_2, "TSY: CMmPacketServiceTsy::CompleteNotifyStatusChange. Service Status:%d", aPacketStatus );
 CMmPacketServiceTsy::ReqCompleted( reqHandle, aErrorCode );
 }
 }
 }
 // that the activation request should be re-sent up to five times.
 //----------------------------------------------------------------------------
 //
 TInt CMmPacketServiceTsy::RejectActivationRequestL()
 {
-TFLOGSTRING("TSY: CMmPacketServiceTsy::RejectActivationRequestL." );
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_REJECTACTIVATIONREQUESTL_1, "TSY: CMmPacketServiceTsy::RejectActivationRequestL." );
 const TTsyReqHandle tsyRegHandle( iTsyReqHandleStore->GetTsyReqHandle(
 EMultimodePacketServiceRejectActivationRequest ) );
 TInt ret( KErrServerBusy );
 // Completes asynchronous reject activation request.
 //----------------------------------------------------------------------------
 //
 void CMmPacketServiceTsy::CompleteRejectActivationRequest()
 {
-TFLOGSTRING("TSY: CMmPacketServiceTsy::CompleteRejectActivationRequest." );
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_COMPLETEREJECTACTIVATIONREQUEST_1, "TSY: CMmPacketServiceTsy::CompleteRejectActivationRequest." );
 // Reset request handle. Returns the deleted request handle
 const TTsyReqHandle reqHandle( iTsyReqHandleStore->ResetTsyReqHandle(
 EMultimodePacketServiceRejectActivationRequest ) );
 //----------------------------------------------------------------------------
 //
 TInt CMmPacketServiceTsy::SetAttachModeL(
 const RPacketService::TAttachMode* aMode )
 {
-TFLOGSTRING("TSY: CMmPacketServiceTsy::SetAttachModeL." );
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_SETATTACHMODEL_1, "TSY: CMmPacketServiceTsy::SetAttachModeL." );
 iAttachMode = *aMode;
 TInt ret( KErrServerBusy );
 const TTsyReqHandle reqHandle( iTsyReqHandleStore->GetTsyReqHandle(
 //----------------------------------------------------------------------------
 //
 void CMmPacketServiceTsy::CompleteSetAttachMode(
 const TInt aError )  //error value
 {
-TFLOGSTRING2("TSY: CMmPacketServiceTsy::CompleteSetAttachMode. Error Value: %d", aError );
+OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_COMPLETESETATTACHMODE_1, "TSY: CMmPacketServiceTsy::CompleteSetAttachMode. Error Value: %d", aError );
 // Reset request handle. Returns the deleted request handle
 const TTsyReqHandle reqHandle( iTsyReqHandleStore->ResetTsyReqHandle(
 EMultimodePacketServiceSetAttachMode ) );
 TInt CMmPacketServiceTsy::SetPreferredBearerL(
 const TDataPackage& aPackage )
 {
 	TAny* const dataPtr = aPackage.Ptr1();
-TFLOGSTRING2("TSY: CMmPacketServiceTsy::SetPreferredBearerL. Preferred Bearer: %d", &dataPtr );
+OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_SETPREFERREDBEARERL_1, "TSY: CMmPacketServiceTsy::SetPreferredBearerL. Preferred Bearer: %d", &dataPtr );
 const TTsyReqHandle reqHandle( iTsyReqHandleStore->GetTsyReqHandle(
 EMultimodePacketServiceSetPreferredBearer ) );
 TInt ret( KErrServerBusy );
 //----------------------------------------------------------------------------
 //
 void CMmPacketServiceTsy::CompleteSetPreferredBearer(
 const TInt aError )  //epoc error code
 {
-TFLOGSTRING2("TSY: CMmPacketServiceTsy::CompleteSetPreferredBearer. Error: %d", aError );
+OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_COMPLETESETPREFERREDBEARER_1, "TSY: CMmPacketServiceTsy::CompleteSetPreferredBearer. Error: %d", aError );
 // Reset request handle. Returns the deleted request handle
 const TTsyReqHandle reqHandle( iTsyReqHandleStore->ResetTsyReqHandle(
 EMultimodePacketServiceSetPreferredBearer ) );
 {
 if ( KErrNone == aError )
 {
 iInternalSavedData.iPreferredBearer =
 iTemporarySavedData.iPreferredBearer;
-TFLOGSTRING2("TSY: CMmPacketServiceTsy::CompleteSetPreferredBearer. Preferred Bearer: %d", iInternalSavedData.iPreferredBearer );
+OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_COMPLETESETPREFERREDBEARER_2, "TSY: CMmPacketServiceTsy::CompleteSetPreferredBearer. Preferred Bearer: %d", iInternalSavedData.iPreferredBearer );
 }
 // Complete the client request
 CMmPacketServiceTsy::ReqCompleted( reqHandle, aError );
 }
 TInt CMmPacketServiceTsy::ExtFunc(
 const TTsyReqHandle aTsyReqHandle,
 const TInt aIpc,
 const TDataPackage& aPackage )
 {
-TFLOGSTRING2("TSY: CMmPacketServiceTsy::ExtFunc. IPC: %d", aIpc );
+OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_EXTFUNC_1, "TSY: CMmPacketServiceTsy::ExtFunc. IPC: %d", aIpc );
 TInt ret( KErrNone );
 TInt trapError( KErrNone );
 // Ensure the ReqHandleType is unset.
 //
 TInt CMmPacketServiceTsy::DoExtFuncL(
 const TInt aIpc,
 const TDataPackage& aPackage )
 {
-TFLOGSTRING3("TSY: CMmPacketServiceTsy::DoExtFuncL. IPC: %d TSY Req Handle:%d", aIpc, iTsyReqHandle);
+OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_DOEXTFUNCL_1, "TSY: CMmPacketServiceTsy::DoExtFuncL. IPC: %d TSY Req Handle:%d", aIpc, iTsyReqHandle);
 TInt ret( KErrNotSupported );
 TAny* const dataPtr = aPackage.Ptr1();
 TAny* const dataPtr2 = aPackage.Ptr2();
 //----------------------------------------------------------------------------
 //
 CTelObject::TReqMode CMmPacketServiceTsy::ReqModeL(
 const TInt aIpc )
 {
-TFLOGSTRING2("TSY: CMmPacketServiceTsy::ReqModeL. IPC: %d", aIpc );
+OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_REQMODEL_1, "TSY: CMmPacketServiceTsy::ReqModeL. IPC: %d", aIpc );
 CTelObject::TReqMode reqMode( 0 );
 switch ( aIpc )
 {
 // All disabled TSYs wishing to implement their own buffering
 //----------------------------------------------------------------------------
 //
 TInt CMmPacketServiceTsy::NumberOfSlotsL(
 const TInt aIpc )
 {
-TFLOGSTRING2("TSY: CMmPacketServiceTsy::NumberOfSlotsL. IPC: %d", aIpc );
+OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_NUMBEROFSLOTSL_1, "TSY: CMmPacketServiceTsy::NumberOfSlotsL. IPC: %d", aIpc );
 TInt numberOfSlots( 0 );
 switch ( aIpc )
 {
 //
 TInt CMmPacketServiceTsy::CancelService(
 const TInt aIpc,
 const TTsyReqHandle aTsyReqHandle )
 {
-TFLOGSTRING3("TSY: CMmPacketServiceTsy::CancelService. IPC: %d Tsy Req Handle:%d", aIpc, aTsyReqHandle);
+OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_CANCELSERVICE_1, "TSY: CMmPacketServiceTsy::CancelService. IPC: %d Tsy Req Handle:%d", aIpc, aTsyReqHandle);
 TInt ret( KErrNone );
 // Ensure the ReqHandleType is unset.
 // This will detect cases where this method indirectly calls itself
 //----------------------------------------------------------------------------
 //
 TInt CMmPacketServiceTsy::RegisterNotification(
 const TInt aIpc )
 	{
-TFLOGSTRING2("TSY: CMmPacketServiceTsy::RegisterNotification. IPC: %d", aIpc );
+OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_REGISTERNOTIFICATION_1, "TSY: CMmPacketServiceTsy::RegisterNotification. IPC: %d", aIpc );
 TInt ret( KErrNone );
 switch ( aIpc )
 {
 //----------------------------------------------------------------------------
 //
 TInt CMmPacketServiceTsy::DeregisterNotification(
 const TInt aIpc )
 {
-TFLOGSTRING2("TSY: CMmPacketServiceTsy::DeregisterNotification. IPC: %d", aIpc );
+OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_DEREGISTERNOTIFICATION_1, "TSY: CMmPacketServiceTsy::DeregisterNotification. IPC: %d", aIpc );
 TInt ret( KErrNone );
 switch ( aIpc )
 {
 //
 TInt CMmPacketServiceTsy::GetMbmsNetworkServiceStatus(
 		TBool aAttemptAttach,
 		TMbmsNetworkServiceStatus* aMBMSServiceStatus )
 {
-TFLOGSTRING2("TSY: CMmPacketServiceTsy:: TMbmsNetworkServiceStatus = %d", aMBMSServiceStatus );
+OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_GETMBMSNETWORKSERVICESTATUS_1, "TSY: CMmPacketServiceTsy:: TMbmsNetworkServiceStatus = %d", aMBMSServiceStatus );
 const TTsyReqHandle regHandle( iTsyReqHandleStore->GetTsyReqHandle(
 EMultimodePacketServiceGetMBMSStatus ) );
 TInt ret( KErrServerBusy );
 //-----------------------------------------------------------------------------
 //
 void CMmPacketServiceTsy::CompleteGetMbmsNetworkServiceStatus(
 	CMmDataPackage* aDataPackage, TInt aError )
 	{
-TFLOGSTRING("TSY: CMmPacketServiceTsy::CompleteGetMbmsNetworkServiceStatus.");
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_COMPLETEGETMBMSNETWORKSERVICESTATUS_1, "TSY: CMmPacketServiceTsy::CompleteGetMbmsNetworkServiceStatus.");
 	//Update the cache
 	TMbmsNetworkServiceStatus mbmsNetworkServiceStatus = EMbmsSupportUnknown;
 	if ( KErrNone == aError )
 		{
 //
 TInt CMmPacketServiceTsy::NotifyMbmsNetworkServiceStatusChange(
 	TMbmsNetworkServiceStatus* aMBMSServiceStatus )
 	{
-TFLOGSTRING2("TSY: CMmPacketServiceTsy::NotifyMbmsNetworkServiceStatusChange TMbmsNetworkServiceStatus = %d", aMBMSServiceStatus );
+OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_NOTIFYMBMSNETWORKSERVICESTATUSCHANGE_1, "TSY: CMmPacketServiceTsy::NotifyMbmsNetworkServiceStatusChange TMbmsNetworkServiceStatus = %d", aMBMSServiceStatus );
 	// Set request handle and save pointer to aMBMSServiceStatus
 iNotifyDataPointers.iMBMSStatusChange = aMBMSServiceStatus;
 iReqHandleType =  EMultimodePacketServiceNotifyMBMSStatusChange;
 //-----------------------------------------------------------------------------
 //
 void CMmPacketServiceTsy::CompleteNotifyMbmsNetworkServiceStatusChange(
 	CMmDataPackage* aDataPackage, TInt aResult )
 	{
-TFLOGSTRING("TSY: CMmPacketServiceTsy::NotifyMbmsNetworkServiceStatusChange.");
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_COMPLETENOTIFYMBMSNETWORKSERVICESTATUSCHANGE_1, "TSY: CMmPacketServiceTsy::NotifyMbmsNetworkServiceStatusChange.");
 	TInt result = aResult;
 	if (aResult == KErrNone)
 		{
 		//Unpack necessary data from datapackage
 // MBMS network service is detected.
 //-----------------------------------------------------------------------------
 //
 TInt CMmPacketServiceTsy::NotifyMbmsServiceAvailabilityChange()
 	{
-TFLOGSTRING("TSY: CMmPacketServiceTsy::NotifyMbmsServiceAvailabilityChange.");
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_NOTIFYMBMSSERVICEAVAILABILITYCHANGE_1, "TSY: CMmPacketServiceTsy::NotifyMbmsServiceAvailabilityChange.");
 	// Set request handle
 iReqHandleType =  EMultimodePacketServiceNotifyMbmsServiceAvailabilityChange;
 return KErrNone;
 			{
 			aCount = 0;
 			}
 	aMaxAllowed = iMaxMonitoredServices;
-TFLOGSTRING("TSY: CMmPacketServiceTsy::EnumerateMonitorServiceList." );
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_ENUMERATEMONITORSERVICELIST_1, "TSY: CMmPacketServiceTsy::EnumerateMonitorServiceList." );
 	// Complete the request with KErrNone
 	CMmPacketServiceTsy::ReqCompleted( iTsyReqHandle, KErrNone );
 return KErrNone;
 	return ret;
 }
 //----------------------------------------------------------------------------
-// CMmPacketServiceTsy::CompleteUpdateMbmsMonitorServiceList
+// CMmPacketServiceTsy::CompleteUpdateMbmsMonitorServiceListL
 // Completes update monitored service list request
 //----------------------------------------------------------------------------
 //
 void CMmPacketServiceTsy::CompleteUpdateMbmsMonitorServiceList(
 CMmDataPackage* aDataPackage,
 const TInt aResult)
 	{
-	TFLOGSTRING( "TSY: CMmPacketServiceTsy::CompleteUpdateMbmsMonitorServiceListL." );
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_COMPLETEUPDATEMBMSMONITORSERVICELIST_1,  "TSY: CMmPacketServiceTsy::CompleteUpdateMbmsMonitorServiceListL." );
 	TInt result= aResult;
 	TInt err(KErrNone);
 	// Reset request handle. Returns the deleted request handle
 	const TTsyReqHandle reqHandle( iTsyReqHandleStore->ResetTsyReqHandle(
 // Completes update monitored service list request
 //----------------------------------------------------------------------------
 //
 TInt CMmPacketServiceTsy::UpdateMbmsMonitorServiceListCancel( TTsyReqHandle aTsyReqHandle )
 	{
-	TFLOGSTRING2( "TSY: CMmPacketServiceTsy::UpdateMbmsMonitorServiceListCancel ReqHandle %d", aTsyReqHandle );
+	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_UPDATEMBMSMONITORSERVICELISTCANCEL_1,  "TSY: CMmPacketServiceTsy::UpdateMbmsMonitorServiceListCancel ReqHandle %d", aTsyReqHandle );
 	if ( aTsyReqHandle != EMultimodePacketServiceReqHandleUnknown )
 {
 // Reset tsy request handle
 iTsyReqHandleStore->ResetTsyReqHandle( EMultimodePacketServiceUpdateMBMSMonitorServiceList );
 // Returns size of the monitored service list.
 //----------------------------------------------------------------------------
 //
 TInt CMmPacketServiceTsy::GetMbmsMonitoredServicesPhase1L(RMobilePhone::TClientId* aClient,  TUint& aBufSize)
 	{
-	TFLOGSTRING("TSY: CMmPacketServiceTsy::GetMbmsMonitoredServicesPhase1L called.");
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_GETMBMSMONITOREDSERVICESPHASE1L_1, "TSY: CMmPacketServiceTsy::GetMbmsMonitoredServicesPhase1L called.");
 	// Initialize ret value
 	TInt ret( KErrNone );
 	TInt leaveCode( KErrNone );
 // ---------------------------------------------------------------------------
 //
 TInt CMmPacketServiceTsy::GetSizeOfMonitoredServiceListL(RMobilePhone::TClientId* aClient,  TUint& aBufSize)
 	{
 	// read the list, store its content and then return size of this buffer to client
-	TFLOGSTRING("TSY: CMmPacketServiceTsy::GetSizeOfMonitoredServiceList called.");
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_GETSIZEOFMONITOREDSERVICELISTL_1, "TSY: CMmPacketServiceTsy::GetSizeOfMonitoredServiceList called.");
 	// create new list
 	CPcktMbmsMonitoredServiceList* currentList=CPcktMbmsMonitoredServiceList::NewL();
 	CleanupStack::PushL(currentList);
 	RPacketService::TMbmsServiceAvailabilityV1 entry;
 	iGetMbmsMonitoredServiceLists->AppendL(read);
 	CleanupStack::Pop(); // pop the CListReadAllAttempt; the read will be destroy in phase 2
 // return the CBufFlat's size to client
 	aBufSize=(read->iListBuf)->Size();
-TFLOGSTRING2("TSY: CMmPacketServiceTsy::GetSizeOfMonitoredServiceList: size=%d",aBufSize);
+OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_GETSIZEOFMONITOREDSERVICELISTL_2, "TSY: CMmPacketServiceTsy::GetSizeOfMonitoredServiceList: size=%d",aBufSize);
 // Complete first phase of list retrieval
 ReqCompleted( iTsyReqHandle, KErrNone );
 CleanupStack::PopAndDestroy( currentList ); // Pop & destroy list
 return KErrNone;
 	}
 TInt CMmPacketServiceTsy::GetMbmsMonitoredServicesPhase2(RMobilePhone::TClientId* aClient, TDes8* aBuf)
 	{
 	// Initialize ret value
 TInt ret( KErrNotFound );
-	TFLOGSTRING("TSY: CMmPacketServiceTsy::GetMbmsMonitoredServicesPhase2 called");
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_GETMBMSMONITOREDSERVICESPHASE2_1, "TSY: CMmPacketServiceTsy::GetMbmsMonitoredServicesPhase2 called");
 	CListReadAllAttempt* read=NULL;
 	// Find the get Mbms monitored services from this client
 	for (TInt i=0; i<iGetMbmsMonitoredServiceLists->Count(); ++i)
 		{
 //-----------------------------------------------------------------------------
 //
 TInt CMmPacketServiceTsy::GetMbmsMonitoredServicesCancel( TTsyReqHandle aTsyReqHandle )
 	{
-TFLOGSTRING("TSY: CMmPacketServiceTsy::GetMbmsMonitoredServicesPhase1LCancel called");
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_GETMBMSMONITOREDSERVICESCANCEL_1, "TSY: CMmPacketServiceTsy::GetMbmsMonitoredServicesPhase1LCancel called");
 // Remove the read all attempt
 CListReadAllAttempt* read = NULL;
 // Check that read all array does not contain any data.
 // If it does, delete it.
 //----------------------------------------------------------------------------
 //
 CTelObject* CMmPacketServiceTsy::OpenNewObjectL(
 TDes& aNewName )
 {
-TFLOGSTRING2("TSY: CMmPacketServiceTsy::OpenNewObjectL. %S", &aNewName );
+OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_OPENNEWOBJECTL_1, "TSY: CMmPacketServiceTsy::OpenNewObjectL. %S", aNewName );
 CTelObject* newContext = NULL;
 TUint8 proxyId( 0 );
 TInt ret( KErrNone );
 if(0 == aNewName.Compare(KMBMSContextName))
 {
 ret = iMBMSContextList->GenerateNewContextName( aNewName, proxyId, iMaxActiveServices );
 if( KErrNone != ret )
 {
-TFLOGSTRING2("TSY: CMmPacketServiceTsy::OpenNewObjectL. Mbms Leaves with: %d", ret );
+OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_OPENNEWOBJECTL_2, "TSY: CMmPacketServiceTsy::OpenNewObjectL. Mbms Leaves with: %d", ret );
 User::Leave( ret );
 }
 CMmMBMSContextTsy* context = CMmMBMSContextTsy::NewL( this, aNewName, proxyId );
 ret = iMBMSContextList->AddObject( context );
 {
 // Created context couldn't save.
 // Call Close() to context to remove it completely
 context->Close();
 context = NULL;
-TFLOGSTRING2("TSY: CMmPacketServiceTsy::OpenNewObjectL. Mbms Leaves  with: %d", ret );
+OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_OPENNEWOBJECTL_3, "TSY: CMmPacketServiceTsy::OpenNewObjectL. Mbms Leaves  with: %d", ret );
 User::Leave( ret );
 }
 else
 {
-TFLOGSTRING3("TSY: CMmPacketServiceTsy::OpenNewObjectL. New MBMS Context Name: %S Proxy Id: %d",&aNewName, proxyId );
+OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_OPENNEWOBJECTL_4, "TSY: CMmPacketServiceTsy::OpenNewObjectL. New MBMS Context Name: %S Proxy Id: %d",aNewName, proxyId );
 newContext = context;
 }
 }
 else
 {
 // Reason to leave is that maximum number of Contexts already exists.
 // Leaving from here requires that TSY is configurated with max number
 // of context supported by this phone ( value KMmMaxNumberOfContexts )
 ret = CMmCommonStaticUtility::EpocErrorCode(
 KErrOverflow, KErrUmtsMaxNumOfContextExceededByPhone );
-TFLOGSTRING2("TSY: CMmPacketServiceTsy::OpenNewObjectL. Leaves with: %d", ret );
+OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_OPENNEWOBJECTL_5, "TSY: CMmPacketServiceTsy::OpenNewObjectL. Leaves with: %d", ret );
 User::Leave( ret );
 }
 CMmPacketContextTsy* context = CMmPacketContextTsy::NewL( this, iHostCID, aNewName, proxyId );
 	// reset cotext name
 {
 // Created context couldn't save.
 // Call Close() to context to remove it completely
 context->Close();
 context = NULL;
-TFLOGSTRING2("TSY: CMmPacketServiceTsy::OpenNewObjectL. Leaves with: %d", ret );
+OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_OPENNEWOBJECTL_6, "TSY: CMmPacketServiceTsy::OpenNewObjectL. Leaves with: %d", ret );
 User::Leave( ret );
 }
 else
 {
-TFLOGSTRING3("TSY: CMmPacketServiceTsy::OpenNewObjectL. New Context Name: %S Proxy Id: %d",&aNewName, proxyId );
+OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_OPENNEWOBJECTL_7, "TSY: CMmPacketServiceTsy::OpenNewObjectL. New Context Name: %S Proxy Id: %d",aNewName, proxyId );
 newContext = context;
 }
 }
 return newContext;
 }
 //----------------------------------------------------------------------------
 //
 CTelObject* CMmPacketServiceTsy::OpenNewObjectByNameL(
 const TDesC& aName )
 {
-TFLOGSTRING2("TSY: CMmPacketServiceTsy::OpenNewObjectByNameL. Context Name: %S", &aName );
+OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_OPENNEWOBJECTBYNAMEL_1, "TSY: CMmPacketServiceTsy::OpenNewObjectByNameL. Context Name: %S", aName );
 // length of object's name cannot be over 16 chars
 if ( 16 < aName.Length() )
 {
-TFLOGSTRING2("TSY: CMmPacketServiceTsy::OpenNewObjectByNameL. Leaves with: %d", KErrOverflow  );
+OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_OPENNEWOBJECTBYNAMEL_2, "TSY: CMmPacketServiceTsy::OpenNewObjectByNameL. Leaves with: %d", KErrOverflow  );
 User::Leave( KErrOverflow  );
 }
 const TInfoName mmPacketContextName( aName );
 CMmPacketContextTsy* mmPacketContext = NULL;
 if ( mmPacketContextName.Compare( KStringExternal ) == 0 )
 {
-TFLOGSTRING("TSY: CMmPacketServiceTsy::OpenNewObjectByNameL :Open Existing Dial-up Object." );
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_OPENNEWOBJECTBYNAMEL_3, "TSY: CMmPacketServiceTsy::OpenNewObjectByNameL :Open Existing Dial-up Object." );
 mmPacketContext = iDialUpContext;
 }
 else if ( mmPacketContextName.Compare( KStringExternal2 ) == 0 )
 {
-TFLOGSTRING("TSY: CMmPacketServiceTsy::OpenNewObjectByNameL :Open Existing Secondary Dial-up Object." );
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_OPENNEWOBJECTBYNAMEL_4, "TSY: CMmPacketServiceTsy::OpenNewObjectByNameL :Open Existing Secondary Dial-up Object." );
 mmPacketContext = iSecondaryDialUpContext;
 }
 else
 {
 mmPacketContext =
 }
 // If not found, Leaves
 if ( NULL == mmPacketContext )
 {
-TFLOGSTRING2("TSY: CMmPacketServiceTsy::OpenNewObjectByNameL. Leaves with: %d", KErrNotFound );
+OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_OPENNEWOBJECTBYNAMEL_5, "TSY: CMmPacketServiceTsy::OpenNewObjectByNameL. Leaves with: %d", KErrNotFound );
 User::Leave( KErrNotFound );
 }
 return mmPacketContext;
 }
 // Call service's Complete()
 Complete( aReqHandleType, aError );
 }
 else if ( aObject == iDialUpContext && NULL != iDialUpContext )
 {
-TFLOGSTRING("TSY: CMmPacketServiceTsy::OpenNewObjectByNameL :Complete Dial-up Object Request." );
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_COMPLETE_1, "TSY: CMmPacketServiceTsy::OpenNewObjectByNameL :Complete Dial-up Object Request." );
 iDialUpContext->Complete( aReqHandleType, aError );
 }
 else if ( aObject == iSecondaryDialUpContext
 && NULL != iSecondaryDialUpContext )
 {
-TFLOGSTRING("TSY: CMmPacketServiceTsy::OpenNewObjectByNameL :Complete Dial-up Object Request." );
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_COMPLETE_2, "TSY: CMmPacketServiceTsy::OpenNewObjectByNameL :Complete Dial-up Object Request." );
 iSecondaryDialUpContext->Complete( aReqHandleType, aError );
 }
 else
 //
 void CMmPacketServiceTsy::ReqCompleted(
 const TTsyReqHandle aTsyReqHandle,
 const TInt aError )
 {
-TFLOGSTRING3("TSY: CMmPacketServiceTsy::Request Completed. TSY Req Handle: %d Error:%d", aTsyReqHandle, aError );
+OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_REQCOMPLETED_1, "TSY: CMmPacketServiceTsy::Request Completed. TSY Req Handle: %d Error:%d", aTsyReqHandle, aError );
 CTelObject::ReqCompleted( aTsyReqHandle, aError );
 }
 #endif // TF_LOGGING_ENABLED
 //----------------------------------------------------------------------------
 //
 TInt CMmPacketServiceTsy::EnumerateNifs(
 TInt* aCount )
 {
-TFLOGSTRING("TSY: CMmPacketServiceTsy::EnumerateNifs." );
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_ENUMERATENIFS_1, "TSY: CMmPacketServiceTsy::EnumerateNifs." );
 iPacketContextList->EnumerateNifs( aCount );
 CMmPacketServiceTsy::ReqCompleted( iTsyReqHandle, KErrNone );
 //
 TInt CMmPacketServiceTsy::GetNifInfo(
 TInt* aIndex,
 RPacketService::TNifInfoV2* aNifInfoV2 )
 {
-TFLOGSTRING("TSY: CMmPacketServiceTsy::GetNifInfo." );
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_GETNIFINFO_1, "TSY: CMmPacketServiceTsy::GetNifInfo." );
 TInt ret = iPacketContextList->GetNifInfo( aIndex, aNifInfoV2 );
 CMmPacketServiceTsy::ReqCompleted( iTsyReqHandle, ret );
 //
 TInt CMmPacketServiceTsy::EnumerateContextsInNif(
 TDesC* aExistingContextName,
 TInt* aCount )
 {
-TFLOGSTRING("TSY: CMmPacketServiceTsy::EnumerateContextsInNif." );
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_ENUMERATECONTEXTSINNIF_1, "TSY: CMmPacketServiceTsy::EnumerateContextsInNif." );
 	TInt ret = KErrNone;
 	if (aExistingContextName->Length() > KMaxInfoName)
 		{
 		ret = KErrArgument;
 //
 TInt CMmPacketServiceTsy::GetContextNameInNif(
 RPacketService::TContextNameInNif* aContextNameInNif,
 TDes* aContextName )
 {
-TFLOGSTRING("TSY: CMmPacketServiceTsy::GetContextNameInNif." );
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_GETCONTEXTNAMEINNIF_1, "TSY: CMmPacketServiceTsy::GetContextNameInNif." );
 TInt ret = iPacketContextList->GetContextNameInNif( aContextNameInNif,
 aContextName );
 CMmPacketServiceTsy::ReqCompleted( iTsyReqHandle, ret );
 //----------------------------------------------------------------------------
 //
 TInt CMmPacketServiceTsy::SetDefaultContextParamsL(
 const TDataPackage& aPackage )
 {
-TFLOGSTRING("TSY: CMmPacketServiceTsy::SetDefaultContextParamsL." );
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_SETDEFAULTCONTEXTPARAMSL_1, "TSY: CMmPacketServiceTsy::SetDefaultContextParamsL." );
 TInt ret(KErrServerBusy);
 const TTsyReqHandle reqHandle( iTsyReqHandleStore->GetTsyReqHandle(
 EMultimodePacketServiceSetDefaultContextParams ) );
 //----------------------------------------------------------------------------
 //
 void CMmPacketServiceTsy::CompleteSetDefaultContextParams(
 TInt aCause )
 {
-TFLOGSTRING2("TSY: CMmPacketServiceTsy::CompleteSetDefaultContextParams. aCause: %d", aCause );
+OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_COMPLETESETDEFAULTCONTEXTPARAMS_1, "TSY: CMmPacketServiceTsy::CompleteSetDefaultContextParams. aCause: %d", aCause );
 // Reset request handle. Returns the deleted request handle
 const TTsyReqHandle reqHandle( iTsyReqHandleStore->ResetTsyReqHandle(
 EMultimodePacketServiceSetDefaultContextParams ) );
 //----------------------------------------------------------------------------
 //
 TInt CMmPacketServiceTsy::GetDefaultContextParams(
 TPacketDataConfigBase* aContextConfig )
 {
-TFLOGSTRING("TSY: CMmPacketServiceTsy::GetDefaultContextParams." );
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_GETDEFAULTCONTEXTPARAMS_1, "TSY: CMmPacketServiceTsy::GetDefaultContextParams." );
 TInt ret = iMmPacketServiceGsmWcdmaExt->GetDefaultContextParams(
 aContextConfig );
 CMmPacketServiceTsy::ReqCompleted( iTsyReqHandle, ret );
 RCall::TStatus status = call->Status();
 if ( RCall::EStatusUnknown != status &&
 RCall::EStatusIdle != status )
 {
-TFLOGSTRING("TSY: CMmPacketServiceTsy::IsActivationAllowed. CS call active, Context Activation not allowed" );
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_ISACTIVATIONALLOWED_1, "TSY: CMmPacketServiceTsy::IsActivationAllowed. CS call active, Context Activation not allowed" );
 isAllowed = EFalse;
 i = iMmPhone->CallList()->GetNumberOfObjects();
 }
 }
 }
 //----------------------------------------------------------------------------
 //
 void CMmPacketServiceTsy::CompleteNotifyEGprsInfoChange(
 CMmDataPackage* aDataPackage )
 	{
-TFLOGSTRING("TSY: CMmPacketServiceTsy::CompleteNotifyEGprsInfoChange." );
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_COMPLETENOTIFYEGPRSINFOCHANGE_1, "TSY: CMmPacketServiceTsy::CompleteNotifyEGprsInfoChange." );
 	//Unpack data
 	TBool lastEdgeGprsSupport;
 	aDataPackage->UnPackData( lastEdgeGprsSupport );
 RMobilePhone::TMobilePhoneNetworkMode ntwkMode(
 RMobilePhone::ENetworkModeUnknown );
 //Unpack data
 aDataPackage->UnPackData( ntwkMode );
-TFLOGSTRING2("TSY: CMmPacketServiceTsy::CompleteNetworkModeChange. ntwkMode: %d", ntwkMode );
+OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_COMPLETENETWORKMODECHANGE_1, "TSY: CMmPacketServiceTsy::CompleteNetworkModeChange. ntwkMode: %d", ntwkMode );
 iCurrentMode = ntwkMode;
 }
 //----------------------------------------------------------------------------
 // CMmPacketServiceTsy::Context
 // Returns unnamed mutex handle owned by TSY
 //----------------------------------------------------------------------------
 //
 RHandleBase* CMmPacketServiceTsy::GlobalKernelObjectHandle()
 {
-TFLOGSTRING("TSY: CMmPacketServiceTsy::GlobalKernelObjectHandle" );
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_GLOBALKERNELOBJECTHANDLE_1, "TSY: CMmPacketServiceTsy::GlobalKernelObjectHandle" );
 if ( KNullHandle == iMutex.Handle() )
 {
 TInt ret = iMutex.CreateLocal( EOwnerProcess );
 if ( KErrNone == ret )
 {
-TFLOGSTRING("TSY: CMmPacketServiceTsy::GlobalKernelObjectHandle - Mutex created" );
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_GLOBALKERNELOBJECTHANDLE_2, "TSY: CMmPacketServiceTsy::GlobalKernelObjectHandle - Mutex created" );
 }
 else
 {
-TFLOGSTRING("TSY: CMmPacketServiceTsy::GlobalKernelObjectHandle - Mutex creation failed" );
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_GLOBALKERNELOBJECTHANDLE_3, "TSY: CMmPacketServiceTsy::GlobalKernelObjectHandle - Mutex creation failed" );
 }
 }
 else
 {
-TFLOGSTRING("TSY: CMmPacketServiceTsy::GlobalKernelObjectHandle - Mutex creation skipped" );
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_GLOBALKERNELOBJECTHANDLE_4, "TSY: CMmPacketServiceTsy::GlobalKernelObjectHandle - Mutex creation skipped" );
 }
 return &iMutex;
 }
 //
 TInt CMmPacketServiceTsy::SetAlwaysOnL(
 TTsyReqHandle aTsyReqHandle,
 RMmCustomAPI::TSetAlwaysOnMode aMode )
 	{
-TFLOGSTRING2("TSY: CMmPacketServiceTsy::SetAlwaysOn Mode = %d", aMode );
+OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_SETALWAYSONL_1, "TSY: CMmPacketServiceTsy::SetAlwaysOn Mode = %d", aMode );
-TFLOGSTRING2( "TSY: CMmPacketServiceTsy::CompleteSetAlwaysOn ReqHandle %d", aTsyReqHandle );
+OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_SETALWAYSONL_2,  "TSY: CMmPacketServiceTsy::SetAlwaysOn ReqHandle %d", aTsyReqHandle );
 	TInt ret( KErrServerBusy );
 	//Check if request is allready pending
 	TTsyReqHandle reqHandle = iTsyReqHandleStore->GetTsyReqHandle(
 EMultimodePacketSetAlwaysOn );
 //-----------------------------------------------------------------------------
 //
 void CMmPacketServiceTsy::CompleteSetAlwaysOn(
 TInt aError )
 	{
-TFLOGSTRING2( "TSY: CMmPacketServiceTsy::CompleteSetAlwaysOn Error %d", aError );
+OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_COMPLETESETALWAYSON_1,  "TSY: CMmPacketServiceTsy::CompleteSetAlwaysOn Error %d", aError );
 const TTsyReqHandle reqHandle( iTsyReqHandleStore->ResetTsyReqHandle(
 								  EMultimodePacketSetAlwaysOn ) );
-TFLOGSTRING2( "TSY: CMmPacketServiceTsy::CompleteSetAlwaysOn ReqHandle %d", reqHandle );
+OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_COMPLETESETALWAYSON_2,  "TSY: CMmPacketServiceTsy::CompleteSetAlwaysOn ReqHandle %d", reqHandle );
 if ( EMultimodePacketServiceReqHandleUnknown != reqHandle )
 	{
 	CMmCustomTsy* customTsy = CMmPacketServiceTsy::CustomTsy();
 //-----------------------------------------------------------------------------
 //
 void CMmPacketServiceTsy::CancelSetAlwaysOn(
 TTsyReqHandle aTsyReqHandle )
 	{
-TFLOGSTRING2( "TSY: CMmPacketServiceTsy::CancelSetAlwaysOn ReqHandle %d", aTsyReqHandle );
+OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_CANCELSETALWAYSON_1,  "TSY: CMmPacketServiceTsy::CancelSetAlwaysOn ReqHandle %d", aTsyReqHandle );
 	if ( aTsyReqHandle != EMultimodePacketServiceReqHandleUnknown )
 {
 // Reset tsy request handle
 iTsyReqHandleStore->ResetTsyReqHandle( EMultimodePacketSetAlwaysOn );
 // Enumerates all active services
 //-----------------------------------------------------------------------------
 //
 TInt CMmPacketServiceTsy::EnumerateMbmsActiveServiceList( TInt &aCount, TInt &aMaxAllowed )
 {
-TFLOGSTRING2( "TSY: CMmPacketServiceTsy::EnumerateMbmsActiveServiceList. max: %d", aMaxAllowed );
+OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_ENUMERATEMBMSACTIVESERVICELIST_1,  "TSY: CMmPacketServiceTsy::EnumerateMbmsActiveServiceList. max: %d", aMaxAllowed );
 aCount = EnumerateMbmsActiveServices();
 aMaxAllowed = iMaxActiveServices;
-TFLOGSTRING3( "TSY: CMmPacketServiceTsy::EnumerateActiveServiceList Count: %d, Max allowed %d", aCount, aMaxAllowed );
+OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_ENUMERATEMBMSACTIVESERVICELIST_2,  "TSY: CMmPacketServiceTsy::EnumerateActiveServiceList Count: %d, Max allowed %d", aCount, aMaxAllowed );
 // Complete the request with KErrNone
 CMmPacketServiceTsy::ReqCompleted( iTsyReqHandle, KErrNone );
 return KErrNone;
 }
 // Enumerates all active services
 //-----------------------------------------------------------------------------
 //
 TInt CMmPacketServiceTsy::EnumerateMbmsActiveServices()
 {
-TFLOGSTRING2( "TSY: CMmPacketServiceTsy::EnumerateMbmsActiveService. max: %d", iMaxActiveServices );
+OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_ENUMERATEMBMSACTIVESERVICES_1,  "TSY: CMmPacketServiceTsy::EnumerateMbmsActiveService. max: %d", iMaxActiveServices );
 TInt ret( 0 );
 for( TInt i = 0; i< iMBMSContextList->NumberOfContexts(); i++ )
 {
 CMmMBMSContextTsy* context = iMBMSContextList->ContextByIndex( i );
 //
 void CMmPacketServiceTsy::CompleteEnumerateMbmsActiveServiceList(
 CMmDataPackage* aDataPackage,
 const TInt aResult)
 {
-TFLOGSTRING2( "TSY: CMmPacketServiceTsy::CompleteEnumerateMbmsActiveServiceList. Error: %d", aResult );
+OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPACKETSERVICETSY_COMPLETEENUMERATEMBMSACTIVESERVICELIST_1,  "TSY: CMmPacketServiceTsy::CompleteEnumerateMbmsActiveServiceList. Error: %d", aResult );
 if( KErrNone == aResult && NULL != aDataPackage )
 {
 aDataPackage->UnPackData( iMaxActiveServices );
 }

branch	RCL_3
changeset 65	630d2f34d719
parent 21	2492a6e4aed7
child 66	07a122eea281