diff -r 8ab6687fb94c -r 3adadc800673 telephonyserverplugins/common_tsy/commontsy/src/mmcustomtsy/CMmCustomTsy.cpp
--- a/telephonyserverplugins/common_tsy/commontsy/src/mmcustomtsy/CMmCustomTsy.cpp	Thu May 27 14:05:07 2010 +0300
+++ b/telephonyserverplugins/common_tsy/commontsy/src/mmcustomtsy/CMmCustomTsy.cpp	Fri Jun 11 14:49:29 2010 +0300
@@ -1,4 +1,4 @@
-// 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"
@@ -16,6 +16,12 @@
 
 
 //  INCLUDE FILES
+
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "CMmCustomTsyTraces.h"
+#endif
+
 #include "CMmCustomTsy.h"
 #include "CMmCustomGsmExt.h"
 #include "cmmcalllist.h"
@@ -25,7 +31,6 @@
 #include "CMmCommonStaticUtility.h"
 #include "CMmSimLockTsy.h"
 #include "MmTsy_conf.h"
-#include <ctsy/tflogger.h>
 #include "cmmpblist.h"
 #include "cmmphonebookstoretsy.h"
 #include "CMmPacketTsy.h"
@@ -55,7 +60,7 @@
 void CMmCustomTsy::ConstructL(
     CMmPhoneTsy* aMmPhoneTsy )
     {
-TFLOGSTRING("TSY: CMmCustomTsy::ConstructL");
+    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_CONSTRUCTL_1, "TSY: CMmCustomTsy::ConstructL");
     iMmPhoneTsy = aMmPhoneTsy;
 
     iMmCustomExtInterface = CMmCustomGsmExt::NewL( aMmPhoneTsy, this );
@@ -98,7 +103,7 @@
     // update/receive Icc Call forward information
     if( iMmPhoneTsy->NosBootState()->iSIMReady )
         {
-TFLOGSTRING("TSY: CMmCustomTsy::ConstructL -- GET ICC call forward indicators");       
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_CONSTRUCTL_2, "TSY: CMmCustomTsy::ConstructL -- GET ICC call forward indicators");
         // Get Icc cfis values from LTSY
         Phone()->MessageManager()->HandleRequestL( 
             ECustomGetIccCallForwardingStatusIPC );
@@ -108,20 +113,20 @@
  	// if not, query again
     if ( !iMmPhoneTsy->GetHomeZoneParamsChecked() )
     	{
-TFLOGSTRING("TSY: CMmCustomTsy::ConstructL - GetHomeZoneParamsChecked()");    	
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_CONSTRUCTL_3, "TSY: CMmCustomTsy::ConstructL - GetHomeZoneParamsChecked()");
         CMmSIMTsy* simCustomTsy = NULL;
         simCustomTsy = ( CMmSIMTsy* )GetSIMTsyPtr();
-TFLOGSTRING("TSY: CMmCustomTsy::ConstructL - pointer created");
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_CONSTRUCTL_4, "TSY: CMmCustomTsy::ConstructL - pointer created");
 	
         if ( simCustomTsy )
             {
-TFLOGSTRING("TSY: CMmCustomTsy::ConstructL - CheckViagHomeZoneParamsL()");
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_CONSTRUCTL_5, "TSY: CMmCustomTsy::ConstructL - CheckViagHomeZoneParamsL()");
             simCustomTsy->CheckViagHomezoneParamsL();
             iMmPhoneTsy->SetHomeZoneParamsChecked( ETrue );
             }
         else
         	{
-TFLOGSTRING("TSY: CMmCustomTsy::ConstructL - CheckViagHomeZoneParamsL() False");        		
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_CONSTRUCTL_6, "TSY: CMmCustomTsy::ConstructL - CheckViagHomeZoneParamsL() False");
 			iMmPhoneTsy->SetHomeZoneParamsChecked( EFalse );
         	}
     	}     
@@ -130,7 +135,7 @@
 CMmCustomTsy* CMmCustomTsy::NewL(
     CMmPhoneTsy* aMmPhoneTsy )
     {
-TFLOGSTRING("TSY: CMmCustomTsy::NewL");
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_NEWL_1, "TSY: CMmCustomTsy::NewL");
     CMmCustomTsy* mmCustomTsy = new ( ELeave ) CMmCustomTsy();
     CleanupClosePushL( *mmCustomTsy );
     mmCustomTsy->ConstructL( aMmPhoneTsy );
@@ -141,7 +146,7 @@
 
 CMmCustomTsy::~CMmCustomTsy()
     {
-TFLOGSTRING("TSY: CMmCustomTsy::~CMmCustomTsy");
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_DTOR_1, "TSY: CMmCustomTsy::~CMmCustomTsy");
 
 	iFeatureControl.Close();
 	
@@ -211,7 +216,7 @@
     if ( ERfsStateInfoInactive == iMmPhoneTsy->GetRfStateInfo() &&
         !IsRequestPossibleInOffline( aIpc ) )
         {
-TFLOGSTRING2 ("TSY: Offline mode ON, request is not allowed: %d", aIpc );
+OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_EXTFUNC_1, "TSY: Offline mode ON, request is not allowed: %d", aIpc );
         ret = CMmCommonStaticUtility::EpocErrorCode( KErrGeneral,
                 KErrGsmOfflineOpNotAllowed );
 
@@ -544,7 +549,7 @@
                     break;
                 default:
                     // ret is already set as KErrNotSupported
-TFLOGSTRING2("TSY: CMmCustomTsy::DoExtFuncL unsupported ipc=%d", aIpc);
+OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_DOEXTFUNCL_1, "TSY: CMmCustomTsy::DoExtFuncL unsupported ipc=%d", aIpc);
                     break;
                 }
 
@@ -800,7 +805,7 @@
 TSecurityPolicy CMmCustomTsy::GetRequiredPlatSecCaps(
     const TInt aIpc )
     {
-TFLOGSTRING2( "TSY: CMmCustomTsy::GetRequiredPlatSecCaps ipc=%d", aIpc );
+OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_GETREQUIREDPLATSECCAPS_1,  "TSY: CMmCustomTsy::GetRequiredPlatSecCaps ipc=%d", aIpc );
     // assume fail as default return value
     TSecurityPolicy policy( TSecurityPolicy::EAlwaysFail );
 
@@ -809,7 +814,7 @@
     if (ipc >= KIpcCustomExt + EMobileCancelOffset)
         {
         ipc  -= EMobileCancelOffset;
-TFLOGSTRING2("TSY: CMmCustomTsy::GetRequiredPlatSecCaps cancel for ipc=%d", ipc);
+OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_GETREQUIREDPLATSECCAPS_2, "TSY: CMmCustomTsy::GetRequiredPlatSecCaps cancel for ipc=%d", ipc);
         }
 
     switch ( ipc )
@@ -843,7 +848,7 @@
         case ECustomNotifyCellInfoChangeIPC:
         case ECustomGetBandSelectionIPC:
         case ECustomNotifyRemoteAlertingToneStatusChangeIPC:
-TFLOGSTRING("TSY: CMmCustomTsy::GetRequiredPlatSecCaps policy=None");
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_GETREQUIREDPLATSECCAPS_3, "TSY: CMmCustomTsy::GetRequiredPlatSecCaps policy=None");
             policy = TSecurityPolicy( TSecurityPolicy::EAlwaysPass );
             break;
 
@@ -852,14 +857,14 @@
         case ECustomSetSystemNetworkModeIPC:
         case ECustomSimWarmResetIPC:
         case ECustomSetBandSelectionIPC:
-TFLOGSTRING("TSY: CMmCustomTsy::GetRequiredPlatSecCaps policy=NetworkControl");
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_GETREQUIREDPLATSECCAPS_4, "TSY: CMmCustomTsy::GetRequiredPlatSecCaps policy=NetworkControl");
             policy = TSecurityPolicy( ECapabilityNetworkControl );
             break;
 
         // NetworkControl, PowerMgmt
         case ECustomPowerSimOnIPC:
         case ECustomPowerSimOffIPC:
-TFLOGSTRING("TSY: CMmCustomTsy::GetRequiredPlatSecCaps policy=NetworkControl, PowerMgmt");
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_GETREQUIREDPLATSECCAPS_5, "TSY: CMmCustomTsy::GetRequiredPlatSecCaps policy=NetworkControl, PowerMgmt");
             policy = TSecurityPolicy( ECapabilityNetworkControl,
                 ECapabilityPowerMgmt );
             break;
@@ -867,7 +872,7 @@
         // NetworkControl, ReadDeviceData
         case ECustomReleaseFileIPC:
         case ECustomRestartFileIPC:
-TFLOGSTRING("TSY: CMmCustomTsy::GetRequiredPlatSecCaps policy=NetworkControl, ReadDeviceData");
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_GETREQUIREDPLATSECCAPS_6, "TSY: CMmCustomTsy::GetRequiredPlatSecCaps policy=NetworkControl, ReadDeviceData");
             policy = TSecurityPolicy( ECapabilityNetworkControl,
                 ECapabilityReadDeviceData );
             break;
@@ -875,13 +880,13 @@
         // NetworkServices
         case ECustomTerminateCallIPC:
         case ECustomCancelUssdSessionIPC:
-TFLOGSTRING("TSY: CMmCustomTsy::GetRequiredPlatSecCaps policy=NetworkServices");
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_GETREQUIREDPLATSECCAPS_7, "TSY: CMmCustomTsy::GetRequiredPlatSecCaps policy=NetworkServices");
             policy = TSecurityPolicy( ECapabilityNetworkServices );
             break;
 
         // NetworkServices, WriteDeviceData
         case ECustomSetDriveModeIPC:
-TFLOGSTRING("TSY: CMmCustomTsy::GetRequiredPlatSecCaps policy=NetworkServices, WriteDeviceData");
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_GETREQUIREDPLATSECCAPS_8, "TSY: CMmCustomTsy::GetRequiredPlatSecCaps policy=NetworkServices, WriteDeviceData");
             policy = TSecurityPolicy( ECapabilityNetworkServices,
                 ECapabilityWriteDeviceData );
             break;
@@ -902,27 +907,27 @@
         case ECustomReadHSxPAStatusIPC:
         case ECustomGetIccCallForwardingStatusIPC:
         case ECustomGetCellInfoIPC:
-TFLOGSTRING("TSY: CMmCustomTsy::GetRequiredPlatSecCaps policy=ReadDeviceData");
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_GETREQUIREDPLATSECCAPS_9, "TSY: CMmCustomTsy::GetRequiredPlatSecCaps policy=ReadDeviceData");
             policy = TSecurityPolicy( ECapabilityReadDeviceData );
             break;
 
         // ReadDeviceData, Location
         case EReadViagHomeZoneCacheIPC:
-TFLOGSTRING("TSY: CMmCustomTsy::GetRequiredPlatSecCaps policy=ReadDeviceData, Location");
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_GETREQUIREDPLATSECCAPS_10, "TSY: CMmCustomTsy::GetRequiredPlatSecCaps policy=ReadDeviceData, Location");
             policy = TSecurityPolicy( ECapabilityReadDeviceData,
                 ECapabilityLocation );
             break;
 
         // ReadDeviceData, ReadUserData
         case ECustomNotifySsNetworkEventIPC:
-TFLOGSTRING("TSY: CMmCustomTsy::GetRequiredPlatSecCaps policy= ReadDeviceData, ReadUserData");
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_GETREQUIREDPLATSECCAPS_11, "TSY: CMmCustomTsy::GetRequiredPlatSecCaps policy= ReadDeviceData, ReadUserData");
             policy = TSecurityPolicy( ECapabilityReadDeviceData,
                 ECapabilityReadUserData );
             break;
 
         // ReadDeviceData, ReadUserData, Location
         case ECustomReadSimFileIPC:
-TFLOGSTRING("TSY: CMmCustomTsy::GetRequiredPlatSecCaps policy=ReadDeviceData, ReadUserData, Location");
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_GETREQUIREDPLATSECCAPS_12, "TSY: CMmCustomTsy::GetRequiredPlatSecCaps policy=ReadDeviceData, ReadUserData, Location");
             policy = TSecurityPolicy( ECapabilityReadDeviceData,
                 ECapabilityReadUserData,
                 ECapabilityLocation );
@@ -930,7 +935,7 @@
 
         // ReadDeviceData, ReadUserData, WriteUserData, NetworkControl
         case ECustomGetSimAuthenticationDataIPC:
-TFLOGSTRING("TSY: CMmCustomTsy::GetRequiredPlatSecCaps policy=ReadDeviceData, ReadUserData, WriteUserData, NetworkControl");
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_GETREQUIREDPLATSECCAPS_13, "TSY: CMmCustomTsy::GetRequiredPlatSecCaps policy=ReadDeviceData, ReadUserData, WriteUserData, NetworkControl");
             policy = TSecurityPolicy( ECapabilityReadDeviceData,
                 ECapabilityReadUserData,
                 ECapabilityWriteUserData,
@@ -938,14 +943,14 @@
             break;
 
        	case ECustomGetServiceTableSupportbyApplicationIPC:
-TFLOGSTRING("TSY: CMmCustomTsy::GetRequiredPlatSecCaps policy=ReadDeviceData");
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_GETREQUIREDPLATSECCAPS_14, "TSY: CMmCustomTsy::GetRequiredPlatSecCaps policy=ReadDeviceData");
             policy = TSecurityPolicy( ECapabilityReadDeviceData );
             break;
         // ReadDeviceData, WriteDeviceData, ReadUserData, WriteUserData,
         // Location, NetworkServices, NetworkControl
         case ECustomSendAPDUReqIPC:
         case ECustomSendAPDUReqV2IPC:
-TFLOGSTRING("TSY: CMmCustomTsy::GetRequiredPlatSecCaps policy=ReadDeviceData, WriteDeviceData, ReadUserData, WriteUserData, Location, NetworkServices, NetworkControl");
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_GETREQUIREDPLATSECCAPS_15, "TSY: CMmCustomTsy::GetRequiredPlatSecCaps policy=ReadDeviceData, WriteDeviceData, ReadUserData, WriteUserData, Location, NetworkServices, NetworkControl");
             policy = TSecurityPolicy( ECapabilityReadDeviceData,
                 ECapabilityWriteDeviceData,
                 ECapabilityReadUserData,
@@ -959,7 +964,7 @@
         case ECustomStartSimCbTopicBrowsingIPC:
         case ECustomGetNextSimCbTopicIPC:
         case ECustomGetAirTimeDurationIPC:
-TFLOGSTRING("TSY: CMmCustomTsy::GetRequiredPlatSecCaps policy=ReadUserData");
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_GETREQUIREDPLATSECCAPS_16, "TSY: CMmCustomTsy::GetRequiredPlatSecCaps policy=ReadUserData");
             policy = TSecurityPolicy( ECapabilityReadUserData );
             break;
 
@@ -974,32 +979,32 @@
         case ECustomDisablePhoneLockIPC:
         case ECustomSetSimMessageStatusReadIPC:
         case ECustomWriteHSxPAStatusIPC:
-TFLOGSTRING("TSY: CMmCustomTsy::GetRequiredPlatSecCaps policy=WriteDeviceData");
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_GETREQUIREDPLATSECCAPS_17, "TSY: CMmCustomTsy::GetRequiredPlatSecCaps policy=WriteDeviceData");
             policy = TSecurityPolicy( ECapabilityWriteDeviceData );
             break;
 
         // WriteDeviceData, Location
         case EWriteViagHomeZoneCacheIPC:
-TFLOGSTRING("TSY: CMmCustomTsy::GetRequiredPlatSecCaps policy=WriteDeviceData, Location");
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_GETREQUIREDPLATSECCAPS_18, "TSY: CMmCustomTsy::GetRequiredPlatSecCaps policy=WriteDeviceData, Location");
             policy = TSecurityPolicy( ECapabilityWriteDeviceData,
                 ECapabilityLocation );
             break;
 
         // WriteUserData
         case ECustomDeleteSimCbTopicIPC:
-TFLOGSTRING("TSY: CMmCustomTsy::GetRequiredPlatSecCaps policy=WriteUserData");
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_GETREQUIREDPLATSECCAPS_19, "TSY: CMmCustomTsy::GetRequiredPlatSecCaps policy=WriteUserData");
             policy = TSecurityPolicy( ECapabilityWriteUserData );
             break;
 
         // WriteDeviceData
         case EWriteViagHomeZoneUHZIUESettingsIPC:
-TFLOGSTRING("TSY: CMmCustomTsy::GetRequiredPlatSecCaps policy=WriteDeviceData");
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_GETREQUIREDPLATSECCAPS_20, "TSY: CMmCustomTsy::GetRequiredPlatSecCaps policy=WriteDeviceData");
             policy = TSecurityPolicy( ECapabilityWriteDeviceData );
             break;
         default:
             // if none of the above then we end up here,
             // as a default we already have caps as alwaysfail.
-TFLOGSTRING("TSY: CMmCustomTsy::GetRequiredPlatSecCaps policy=AlwaysFail");
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_GETREQUIREDPLATSECCAPS_21, "TSY: CMmCustomTsy::GetRequiredPlatSecCaps policy=AlwaysFail");
             break;
         }
 
@@ -1305,7 +1310,7 @@
     TInt ret ( KErrNone );
     TInt rfStateInfo ( ERfsStateInfoNormal );
 
-TFLOGSTRING( "CMmCustomTSY: CMmCustomTsy::SimAuthentication" );
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_SIMAUTHENTICATIONL_1,  "CMmCustomTSY: CMmCustomTsy::SimAuthentication" );
 
     TTsyReqHandle reqHandle = iTsyReqHandleStore->GetTsyReqHandle(ECustomTsyGetSimAuthenticationData);
     if(0 < reqHandle)
@@ -1349,69 +1354,69 @@
     else if ( RMmCustomAPI::TSimAuthenticationBase::EGbaBootstrap ==
         basePtr->ExtensionId() )
         {
-TFLOGSTRING( "CMmCustomTSY: SimAuthenticationL::in EGbaBootstrap" );
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_SIMAUTHENTICATIONL_2,  "CMmCustomTSY: SimAuthenticationL::in EGbaBootstrap" );
         iGbaBootstrap = REINTERPRET_CAST( 
 	        RMmCustomAPI::TSimAuthenticationGbaBootstrap*, basePtr );
 
         rand.Append( iGbaBootstrap->iRandomParameters );
 
         authenticationDataPackage.PackData( iGbaBootstrap, &rfStateInfo  ); 
-TFLOGSTRING( "CMmCustomTSY: SimAuthenticationL::out EGbaBootstrap" ); 
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_SIMAUTHENTICATIONL_3,  "CMmCustomTSY: SimAuthenticationL::out EGbaBootstrap" );
         }
     else if ( RMmCustomAPI::TSimAuthenticationBase::EGbaBootstrapUpdate ==
         basePtr->ExtensionId() )
         {
-TFLOGSTRING( "CMmCustomTSY: SimAuthenticationL::in EGbaBootstrapUpdate" );
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_SIMAUTHENTICATIONL_4,  "CMmCustomTSY: SimAuthenticationL::in EGbaBootstrapUpdate" );
         iGbaBootstrapUpdate = REINTERPRET_CAST( 
         	RMmCustomAPI::TSimAuthenticationGbaBootstrapUpdate*, basePtr );
 
         authenticationDataPackage.PackData( iGbaBootstrapUpdate, &rfStateInfo  ); 
-TFLOGSTRING( "CMmCustomTSY: SimAuthenticationL::out EGbaBootstrapUpdate" ); 
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_SIMAUTHENTICATIONL_5,  "CMmCustomTSY: SimAuthenticationL::out EGbaBootstrapUpdate" );
         }
     else if ( 
         RMmCustomAPI::TSimAuthenticationBase::EGbaBootstrapNafDerivation ==
         basePtr->ExtensionId() )
         {
-TFLOGSTRING( "CMmCustomTSY: SimAuthenticationL::in EGbaBootstrapNafDerivation" );
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_SIMAUTHENTICATIONL_6,  "CMmCustomTSY: SimAuthenticationL::in EGbaBootstrapNafDerivation" );
         iGbaNafDerivation = REINTERPRET_CAST( 
         	RMmCustomAPI::TSimAuthenticationGbaNafDerivation*, basePtr );
 
         authenticationDataPackage.PackData( iGbaNafDerivation, &rfStateInfo  ); 
-TFLOGSTRING( "CMmCustomTSY: SimAuthenticationL::out EGbaBootstrapNafDerivation" );
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_SIMAUTHENTICATIONL_7,  "CMmCustomTSY: SimAuthenticationL::out EGbaBootstrapNafDerivation" );
         }
     else if ( RMmCustomAPI::TSimAuthenticationBase::EMgvMskUpdate ==
         basePtr->ExtensionId() )
         {
-TFLOGSTRING( "CMmCustomTSY: SimAuthenticationL::in EMgvMskUpdate" );  
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_SIMAUTHENTICATIONL_8,  "CMmCustomTSY: SimAuthenticationL::in EMgvMskUpdate" );
         iMgvMskUpdate = REINTERPRET_CAST( 
         	RMmCustomAPI::TSimAuthenticationMgvMskUpdate*, basePtr );
 
         authenticationDataPackage.PackData( iMgvMskUpdate, &rfStateInfo  ); 
-TFLOGSTRING( "CMmCustomTSY: SimAuthenticationL::out EMgvMskUpdate" );
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_SIMAUTHENTICATIONL_9,  "CMmCustomTSY: SimAuthenticationL::out EMgvMskUpdate" );
         }
     else if ( RMmCustomAPI::TSimAuthenticationBase::EMgvMtkGeneration ==
         basePtr->ExtensionId() )
         {
-TFLOGSTRING( "CMmCustomTSY: SimAuthenticationL::in EMgvMtkGeneration" );
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_SIMAUTHENTICATIONL_10,  "CMmCustomTSY: SimAuthenticationL::in EMgvMtkGeneration" );
         iMgvMtkGeneration = REINTERPRET_CAST( 
         	RMmCustomAPI::TSimAuthenticationMgvMtkGeneration*, basePtr );
 
         authenticationDataPackage.PackData( iMgvMtkGeneration, &rfStateInfo  ); 
-TFLOGSTRING( "CMmCustomTSY: SimAuthenticationL::out EMgvMtkGeneration" );
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_SIMAUTHENTICATIONL_11,  "CMmCustomTSY: SimAuthenticationL::out EMgvMtkGeneration" );
         }
     else if ( RMmCustomAPI::TSimAuthenticationBase::EMgvMskDeletion ==
         basePtr->ExtensionId() )
         {
-TFLOGSTRING( "CMmCustomTSY: SimAuthenticationL::in EMgvMskDeletion" );
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_SIMAUTHENTICATIONL_12,  "CMmCustomTSY: SimAuthenticationL::in EMgvMskDeletion" );
         iMgvMskDeletion = REINTERPRET_CAST( 
         	RMmCustomAPI::TSimAuthenticationMgvMskDeletion*, basePtr );
 
         authenticationDataPackage.PackData( iMgvMskDeletion, &rfStateInfo  ); 
-TFLOGSTRING( "CMmCustomTSY: SimAuthenticationL::out EMgvMskDeletion" ); 
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_SIMAUTHENTICATIONL_13,  "CMmCustomTSY: SimAuthenticationL::out EMgvMskDeletion" );
         }
     else
         {
-TFLOGSTRING2( "CMmCustomTSY: Invalid authentication type specified: %d", basePtr->ExtensionId() );
+OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_SIMAUTHENTICATIONL_14,  "CMmCustomTSY: Invalid authentication type specified: %d", basePtr->ExtensionId() );
         ret = KErrNotSupported;
 
         iEapSim = NULL;
@@ -1488,7 +1493,7 @@
     CMmDataPackage* aDataPackage,
     TInt aResult )
     {
-TFLOGSTRING( "TSY: CMmCustomTsy::CompleteSimAuthentication" );
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_COMPLETESIMAUTHENTICATION_1,  "TSY: CMmCustomTsy::CompleteSimAuthentication" );
     // reset req handle. Returns the deleted req handle
     TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle(
         ECustomTsyGetSimAuthenticationData );
@@ -1536,7 +1541,7 @@
             else if ( RMmCustomAPI::TSimAuthenticationBase::EGbaBootstrap ==
                 basePtr->ExtensionId() )
                 {
-TFLOGSTRING( "CMmCustomTSY: CompleteSimAuthentication::in EGbaBootstrap" );
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_COMPLETESIMAUTHENTICATION_2,  "CMmCustomTSY: CompleteSimAuthentication::in EGbaBootstrap" );
                 RMmCustomAPI::TSimAuthenticationGbaBootstrap* gbaBootstrap;
 
                 aDataPackage->UnPackData( &gbaBootstrap );
@@ -1548,13 +1553,13 @@
                 iGbaBootstrap = NULL;
 
                 ReqCompleted( reqHandle, aResult );
-TFLOGSTRING( "CMmCustomTSY: CompleteSimAuthentication::out EGbaBootstrap" );
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_COMPLETESIMAUTHENTICATION_3,  "CMmCustomTSY: CompleteSimAuthentication::out EGbaBootstrap" );
                 }
             else if ( 
                 RMmCustomAPI::TSimAuthenticationBase::EGbaBootstrapUpdate ==
                 basePtr->ExtensionId() )
                 {
-TFLOGSTRING( "CMmCustomTSY: CompleteSimAuthentication::in EGbaBootstrapUpdate" );                
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_COMPLETESIMAUTHENTICATION_4,  "CMmCustomTSY: CompleteSimAuthentication::in EGbaBootstrapUpdate" );
                 RMmCustomAPI::TSimAuthenticationGbaBootstrapUpdate* 
                     gbaBootstrapUpdate;
 
@@ -1567,13 +1572,13 @@
                 iGbaBootstrapUpdate = NULL;
 
                 ReqCompleted( reqHandle, aResult );
-TFLOGSTRING( "CMmCustomTSY: CompleteSimAuthentication::out EGbaBootstrapUpdate" );
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_COMPLETESIMAUTHENTICATION_5,  "CMmCustomTSY: CompleteSimAuthentication::out EGbaBootstrapUpdate" );
                 }
             else if ( 
                 RMmCustomAPI::TSimAuthenticationBase::
                     EGbaBootstrapNafDerivation == basePtr->ExtensionId() )
                 {
-TFLOGSTRING( "CMmCustomTSY: CompleteSimAuthentication::in EGbaBootstrapNafDerivation" );                
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_COMPLETESIMAUTHENTICATION_6,  "CMmCustomTSY: CompleteSimAuthentication::in EGbaBootstrapNafDerivation" );
                 RMmCustomAPI::TSimAuthenticationGbaNafDerivation* 
                     gbaNafDerivation;
 
@@ -1586,12 +1591,12 @@
                 iGbaNafDerivation = NULL;
 
                 ReqCompleted( reqHandle, aResult );
-TFLOGSTRING( "CMmCustomTSY: CompleteSimAuthentication::out EGbaBootstrapNafDerivation" );                
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_COMPLETESIMAUTHENTICATION_7,  "CMmCustomTSY: CompleteSimAuthentication::out EGbaBootstrapNafDerivation" );
                 }
             else if ( RMmCustomAPI::TSimAuthenticationBase::EMgvMskUpdate ==
                     basePtr->ExtensionId() )
                 {
-TFLOGSTRING( "CMmCustomTSY: CompleteSimAuthentication::in EMgvMskUpdate" );                
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_COMPLETESIMAUTHENTICATION_8,  "CMmCustomTSY: CompleteSimAuthentication::in EMgvMskUpdate" );
                 RMmCustomAPI::TSimAuthenticationMgvMskUpdate* mgvMskUpdate;
 
                 aDataPackage->UnPackData( &mgvMskUpdate );
@@ -1606,12 +1611,12 @@
                 iMgvMskUpdate = NULL;
 
                 ReqCompleted( reqHandle, aResult );
-TFLOGSTRING( "CMmCustomTSY: CompleteSimAuthentication::out EMgvMskUpdate" );
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_COMPLETESIMAUTHENTICATION_9,  "CMmCustomTSY: CompleteSimAuthentication::out EMgvMskUpdate" );
                 }
             else if ( RMmCustomAPI::TSimAuthenticationBase::
                     EMgvMtkGeneration == basePtr->ExtensionId() )
                 {
-TFLOGSTRING( "CMmCustomTSY: CompleteSimAuthentication::in EMgvMtkGeneration" );                
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_COMPLETESIMAUTHENTICATION_10,  "CMmCustomTSY: CompleteSimAuthentication::in EMgvMtkGeneration" );
                 RMmCustomAPI::TSimAuthenticationMgvMtkGeneration* 
                     mgvMtkGeneration;
 
@@ -1626,7 +1631,7 @@
                 iMgvMtkGeneration = NULL;
 
                 ReqCompleted( reqHandle, aResult );
-TFLOGSTRING( "CMmCustomTSY: CompleteSimAuthentication::out EMgvMtkGeneration" ); 
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_COMPLETESIMAUTHENTICATION_11,  "CMmCustomTSY: CompleteSimAuthentication::out EMgvMtkGeneration" );
                 }
             else if ( RMmCustomAPI::TSimAuthenticationBase::
                     EMgvMskDeletion == basePtr->ExtensionId() )
@@ -1635,7 +1640,7 @@
                 }
             else
                 {
-TFLOGSTRING2( "CMmCustomTSY: Invalid authentication type specified: %d", basePtr->ExtensionId() );
+OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_COMPLETESIMAUTHENTICATION_12,  "CMmCustomTSY: Invalid authentication type specified: %d", basePtr->ExtensionId() );
                 aResult = KErrArgument;
                 ReqCompleted( reqHandle, aResult );
                 }
@@ -1677,7 +1682,7 @@
                 else if( RMmCustomAPI::TSimAuthenticationBase::EGbaBootstrap ==
                         basePtr->ExtensionId() )
                     {
-TFLOGSTRING( "TSYMH: CompleteSimAuthentication RMmCustomAPI::TSimAuthenticationBase::EGbaBootstrap" );
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_COMPLETESIMAUTHENTICATION_13,  "TSYMH: CompleteSimAuthentication RMmCustomAPI::TSimAuthenticationBase::EGbaBootstrap" );
                     RMmCustomAPI::TSimAuthenticationGbaBootstrap* gbabootstrap;
                     aDataPackage->UnPackData( &gbabootstrap );
 
@@ -1762,7 +1767,7 @@
 
     if ( KErrArgument == ret && 0 == iFreshBitCounter )
        {
-TFLOGSTRING( "CMmCustomTsy: RAND rejected" );
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_CHECKRANDVALIDITYL_1,  "CMmCustomTsy: RAND rejected" );
        }
 
     return ret;
@@ -1801,7 +1806,7 @@
 
         if ( KErrNone != ret )
             {
-TFLOGSTRING( "TSY: CMmCustomTsy: 'rand_db.cur' creation failed!" );
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_CREATERANDDB_1,  "TSY: CMmCustomTsy: 'rand_db.cur' creation failed!" );
             }
         else if ( KErrNone == ret )
             {
@@ -1841,13 +1846,13 @@
 
                 if ( KErrNone != ret )
                     {
-TFLOGSTRING( "TSY: CMmCustomTsy: 'rand_db.cur' initialization failed!" );
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_CREATERANDDB_2,  "TSY: CMmCustomTsy: 'rand_db.cur' initialization failed!" );
                     file.Close();
                     }
                 }
             else
                 {
-TFLOGSTRING( "TSY: CMmCustomTsy: 'rand_db.cur' open failed!" );
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_CREATERANDDB_3,  "TSY: CMmCustomTsy: 'rand_db.cur' open failed!" );
                 }
             }
 
@@ -1863,7 +1868,7 @@
         }
     else
         {
-TFLOGSTRING( "TSY: CMmCustomTsy: Could not connect to file server!" );
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_CREATERANDDB_4,  "TSY: CMmCustomTsy: Could not connect to file server!" );
         }
 
     // Give some time for file.Close() and fs.Close() to complete
@@ -1920,7 +1925,7 @@
                     EFileWrite );
                 if( KErrNone != ret )
                     {
-TFLOGSTRING( "TSY: CMmCustomTsy: rand_db open failed" );
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_INSERTBLOBSTORANDDB_1,  "TSY: CMmCustomTsy: rand_db open failed" );
                     }
                 }
             if ( KErrNone != ret )
@@ -1985,7 +1990,7 @@
         }
     else
         {
-TFLOGSTRING( "TSY: CMmCustomTsy: Could not connect to file server!" );
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_INSERTBLOBSTORANDDB_2,  "TSY: CMmCustomTsy: Could not connect to file server!" );
         return ret;
         }
 
@@ -2083,7 +2088,7 @@
         }
     else
         {
-TFLOGSTRING( "TSY: CMmCustomTsy: Could not connect to file server!" );
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_UPDATEBITCOUNTER_1,  "TSY: CMmCustomTsy: Could not connect to file server!" );
         }
 
     return ret;
@@ -2331,7 +2336,7 @@
 void CMmCustomTsy::CompleteTerminateCall(
     TInt aError )
     {
-TFLOGSTRING2( "TSY: CMmCustomTsy::CompleteTerminateCall - aError: %d", aError );
+OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_COMPLETETERMINATECALL_1,  "TSY: CMmCustomTsy::CompleteTerminateCall - aError: %d", aError );
 
     // reset req handle. Returns the deleted req handle
     TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle(
@@ -2356,7 +2361,7 @@
 TInt CMmCustomTsy::NotifyDtmfEvent(
         RMmCustomAPI::TDtmfInfo* aInfo )
     {
-TFLOGSTRING("TSY: CMmCustomTsy::NotifyDtmfEvent");
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_NOTIFYDTMFEVENT_1, "TSY: CMmCustomTsy::NotifyDtmfEvent");
     // save pointer to client data
     iNotifyInfo = aInfo;
 
@@ -2376,7 +2381,7 @@
     RMmCustomAPI::TDtmfInfo aInfo,
     TInt aErrorCode )
     {
-TFLOGSTRING("TSY: CMmCustomTsy::CompleteNotifyDtmfEvent");
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_COMPLETENOTIFYDTMFEVENT_1, "TSY: CMmCustomTsy::CompleteNotifyDtmfEvent");
     // reset request handle. Returns the deleted req handle.
     TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle(
         ECustomTsyNotifyDtmfEvent );
@@ -2443,7 +2448,7 @@
 
         if ( 0 != diags )
             {
-TFLOGSTRING3( "TSY:CMmCustomTsy::GetDiagnosticInfo: Diagnostic info=%d asked for call id=%d", diags, mmCall->CallId() );
+OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_GETDIAGNOSTICINFO_1,  "TSY:CMmCustomTsy::GetDiagnosticInfo: Diagnostic info=%d asked for call id=%d", diags, mmCall->CallId() );
             switch ( diags )
                 {                
                 case KDiagnosticInfoBarredWithCUG:
@@ -2475,17 +2480,17 @@
                     break;
                 }
             }
-TFLOGSTRING2( "TSY: CMmCustomTsy::GetDiagnosticInfo - ReqCompleted - Error code: %d", errorValue );
+OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_GETDIAGNOSTICINFO_2,  "TSY: CMmCustomTsy::GetDiagnosticInfo - ReqCompleted - Error code: %d", errorValue );
         // complete errorvalue to client  - inform change  
         ReqCompleted( aTsyReqHandle, errorValue ); 
         }
     else
         {
          // call is not found
-TFLOGSTRING("TSY: CMmCustomTsy::GetDiagnosticInfo - Call is not found");
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_GETDIAGNOSTICINFO_3, "TSY: CMmCustomTsy::GetDiagnosticInfo - Call is not found");
         ReqCompleted( aTsyReqHandle, KErrNotFound );
         }
-TFLOGSTRING2( "TSY: CMmCustomTsy::GetDiagnosticInfo - Error code: %d", errorValue );
+OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_GETDIAGNOSTICINFO_4,  "TSY: CMmCustomTsy::GetDiagnosticInfo - Error code: %d", errorValue );
    
     return KErrNone;
     }
@@ -2521,7 +2526,7 @@
     const TTsyReqHandle aTsyReqHandle,
     RMmCustomAPI::TRemoteAlertingToneStatus* aToneStatus )
     {
-TFLOGSTRING("TSY: CMmCustomTsy::GetRemoteAlertingToneStatus");
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_GETREMOTEALERTINGTONESTATUS_1, "TSY: CMmCustomTsy::GetRemoteAlertingToneStatus");
     TInt ret = iMmCustomExtInterface->GetRemoteAlertingToneStatus(
         aToneStatus );
 
@@ -2580,7 +2585,7 @@
     const TTsyReqHandle aTsyReqHandle,
     RMmCustomAPI::TGetAlsBlockStatus* aBlockStatus )
     {
-TFLOGSTRING3( "TSY: CMmCustomTsy::GetAlsBlockedL - Req handle: %d, Block status: %d", aTsyReqHandle, *aBlockStatus );
+OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_GETALSBLOCKEDL_1,  "TSY: CMmCustomTsy::GetAlsBlockedL - Req handle: %d, Block status: %d", aTsyReqHandle, *aBlockStatus );
     TTsyReqHandle getAlsBlockedHandle =
         iTsyReqHandleStore->GetTsyReqHandle( ECustomTsyGetAlsBlocked );
 
@@ -2625,7 +2630,7 @@
     RMmCustomAPI::TGetAlsBlockStatus  aBlockStatus,
     TInt aErrorCode )
     {
-TFLOGSTRING3( "TSY: CMmCustomTsy::CompleteGetAlsBlocked - Block status: %d, Error code: %d", aBlockStatus, aErrorCode );
+OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_COMPLETEGETALSBLOCKED_1,  "TSY: CMmCustomTsy::CompleteGetAlsBlocked - Block status: %d, Error code: %d", aBlockStatus, aErrorCode );
     //reset req handle. Returns the deleted req handle
     TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle(
         ECustomTsyGetAlsBlocked );
@@ -2727,7 +2732,7 @@
     const TTsyReqHandle aTsyReqHandle,
     RMmCustomAPI::TSetAlsBlock* aBlockStatus )
     {
-TFLOGSTRING3( "TSY: CMmCustomTsy::SetAlsBlockedL - Req handle: %d, Block status: %d", aTsyReqHandle, *aBlockStatus );
+OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_SETALSBLOCKEDL_1,  "TSY: CMmCustomTsy::SetAlsBlockedL - Req handle: %d, Block status: %d", aTsyReqHandle, *aBlockStatus );
     // get the handle
     TTsyReqHandle setAlsBlockedHandle =
         iTsyReqHandleStore->GetTsyReqHandle( ECustomTsySetAlsBlocked );
@@ -2777,7 +2782,7 @@
 void CMmCustomTsy::CompleteSetAlsBlocked(
     TInt aErrorCode )
     {
-TFLOGSTRING2( "TSY: CMmCustomTsy::CompleteSetAlsBlocked - Error code: %d", aErrorCode );
+OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_COMPLETESETALSBLOCKED_1,  "TSY: CMmCustomTsy::CompleteSetAlsBlocked - Error code: %d", aErrorCode );
     // get reaq handle for NotifyAlsBlockedChanged
     TTsyReqHandle reqHandle = iTsyReqHandleStore->GetTsyReqHandle(
         ECustomTsyNotifyAlsBlockedChanged );
@@ -2849,7 +2854,7 @@
             {
             *iRetNotifyAlsBlockStatus = RMmCustomAPI::EBlockStatusInactive;
             }
-TFLOGSTRING2( "TSY: CMmCustomTsy::CompleteNotifyAlsBlockedChanged - Block status: %d", *iSetBlockStatus );
+OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_COMPLETENOTIFYALSBLOCKEDCHANGED_1,  "TSY: CMmCustomTsy::CompleteNotifyAlsBlockedChanged - Block status: %d", *iSetBlockStatus );
 
         // reset the varible
         iRetNotifyAlsBlockStatus = NULL;
@@ -2891,7 +2896,7 @@
     const TTsyReqHandle aTsyReqHandle,
     RMmCustomAPI::TAlsSupport* aSupport )
     {
-TFLOGSTRING( "TSY: CMmCustomTsy::GetAlsPpSupportL");
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_GETALSPPSUPPORTL_1,  "TSY: CMmCustomTsy::GetAlsPpSupportL");
     // save pointer to client space
     iAlsSupport = aSupport;
     
@@ -2900,7 +2905,7 @@
 
     if ( 0 < reqHandle )
         {
-TFLOGSTRING( "TSY: CMmCustomTsy::GetAlsPpSupportL - Already processing, save handle");
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_GETALSPPSUPPORTL_2,  "TSY: CMmCustomTsy::GetAlsPpSupportL - Already processing, save handle");
         //The request is already in processing because of previous request
         //Complete request with status value informing the client about
 		TCheckAlsPpSupportRequest* req = 
@@ -2921,7 +2926,7 @@
         }
     else
         {
-TFLOGSTRING( "TSY: CMmCustomTsy::GetAlsPpSupportL - Save handle");
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_GETALSPPSUPPORTL_3,  "TSY: CMmCustomTsy::GetAlsPpSupportL - Save handle");
         // Save the req handle type
         iReqHandleType = ECustomTsyGetAlsPpSupport;
 			// save request in queue for completion
@@ -2944,7 +2949,7 @@
 //
 TInt CMmCustomTsy::GetAlsPpSupportCancel()
     {
-TFLOGSTRING( "TSY: CMmCustomTsy::GetAlsPpSupportCancel");
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_GETALSPPSUPPORTCANCEL_1,  "TSY: CMmCustomTsy::GetAlsPpSupportCancel");
     // reset the pointer to client data
     iAlsSupport = NULL;
 
@@ -2955,7 +2960,7 @@
     // complete
     TInt checkAlsPpSupportRequestsCount = 
         iCheckAlsPpSupportRequests.Count();
-TFLOGSTRING2( "TSY: CMmCustomTsy::GetAlsPpSupportCancel - Cancel %d requests", checkAlsPpSupportRequestsCount );
+OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_GETALSPPSUPPORTCANCEL_2,  "TSY: CMmCustomTsy::GetAlsPpSupportCancel - Cancel %d requests", checkAlsPpSupportRequestsCount );
 
 	for ( TInt i=0; i < checkAlsPpSupportRequestsCount ; i++ )
 		{
@@ -2981,7 +2986,7 @@
     RMmCustomAPI::TAlsSupport aAlsSupport,
     TInt aErrorCode )
     {
-TFLOGSTRING3( "TSY: CMmCustomTsy::CompleteGetAlsPpSupport - ALS support: %d, Error: %d", aAlsSupport, aErrorCode );
+OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_COMPLETEGETALSPPSUPPORT_1,  "TSY: CMmCustomTsy::CompleteGetAlsPpSupport - ALS support: %d, Error: %d", aAlsSupport, aErrorCode );
     TBool status = EFalse;
     
     // Check if the get was called internally during boot
@@ -2989,7 +2994,7 @@
         {
     	if( RMmCustomAPI::EAlsSupportOn == aAlsSupport )
             {
-TFLOGSTRING( "TSY: CMmCustomTsy::CompleteGetAlsPpSupport - ALS supported by SIM" );
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_COMPLETEGETALSPPSUPPORT_2,  "TSY: CMmCustomTsy::CompleteGetAlsPpSupport - ALS supported by SIM" );
             status = ETrue;
             }
         //Update ALS status from sim
@@ -3012,7 +3017,7 @@
 
             if( RMmCustomAPI::EAlsSupportOn == aAlsSupport )
             	{
-TFLOGSTRING( "TSY: CMmCustomTsy::CompleteGetAlsPpSupport - ALS supported by SIM" );
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_COMPLETEGETALSPPSUPPORT_3,  "TSY: CMmCustomTsy::CompleteGetAlsPpSupport - ALS supported by SIM" );
             	status = ETrue;
             	}
             //Update ALS status from sim
@@ -3024,7 +3029,7 @@
         // complete
         TInt checkAlsPpSupportRequestsCount = 
             iCheckAlsPpSupportRequests.Count();
-TFLOGSTRING2( "TSY: CMmCustomTsy::CompleteGetAlsPpSupport - Complete %d requests", checkAlsPpSupportRequestsCount );
+OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_COMPLETEGETALSPPSUPPORT_4,  "TSY: CMmCustomTsy::CompleteGetAlsPpSupport - Complete %d requests", checkAlsPpSupportRequestsCount );
 
 		for ( TInt i=0; i < checkAlsPpSupportRequestsCount ; i++ )
 			{
@@ -3206,18 +3211,18 @@
     TBool aCipherStatus,
     TInt aErrorCode )
     {
-TFLOGSTRING("TSY:CMmCustomTsy::CompleteNotifyCipheringInfoChange entered");
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_COMPLETENOTIFYCIPHERINGINFOCHANGE_1, "TSY:CMmCustomTsy::CompleteNotifyCipheringInfoChange entered");
     // this is special case, only called when Ciphering indicator
     // is forced off for some operators
     if ( iMmPhoneTsy->GetNetTsy()->CipheringIndicatorForcedOff() )
         {
-TFLOGSTRING("TSY:CMmCustomTsy::CompleteNotifyCipheringInfoChange: Ciphering forced off");
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_COMPLETENOTIFYCIPHERINGINFOCHANGE_2, "TSY:CMmCustomTsy::CompleteNotifyCipheringInfoChange: Ciphering forced off");
         TTsyReqHandle handle = iTsyReqHandleStore->ResetTsyReqHandle(
             ECustomTsyNotifyCipheringInfoChange );
 
         if ( ECustomTsyReqHandleUnknown != handle )
             {
-TFLOGSTRING("TSY:CMmCustomTsy::CompleteNotifyCipheringInfoChange: Ciphering forced off, request completed");
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_COMPLETENOTIFYCIPHERINGINFOCHANGE_3, "TSY:CMmCustomTsy::CompleteNotifyCipheringInfoChange: Ciphering forced off, request completed");
             iRetNotifyCipheringInfoChange->iIndStatus = EFalse;
             iRetNotifyCipheringInfoChange->iCiphStatus = ETrue;
 
@@ -3517,7 +3522,7 @@
     TInt aError,
     TInt aIPC )
     {
-TFLOGSTRING3( "TSY: CMmCustomTsy::Complete - ReqHandleType: %d Error: %d", aReqHandleType, aError );
+OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_COMPLETE_1,  "TSY: CMmCustomTsy::Complete - ReqHandleType: %d Error: %d", aReqHandleType, aError );
     TBool subTsyReqFound = EFalse;
     TInt max = GetMaxNumberOfSubsystems();
     CMmSubTsyBase** subTsyPtr = GetSubsystemArrayPtr();
@@ -3742,7 +3747,7 @@
     RMmCustomAPI::TEmerNumberCheckMode* aNumberMode,
     TBool* aResult )
     {
-TFLOGSTRING2("TSY: CMmCustomTsy::CheckEmergencyNumberL number=%S", &(aNumberMode->iNumber) );
+OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_CHECKEMERGENCYNUMBERL_1, "TSY: CMmCustomTsy::CheckEmergencyNumberL number=%S", (aNumberMode->iNumber) );
 
     TInt ret(KErrGeneral);
 
@@ -3752,7 +3757,7 @@
     // 3rd Dial check number
     if( iISVDialNumberCheck && 0 == requestHandle )
         {
-TFLOGSTRING2("TSY: CMmCustomTsy::CheckEmergencyNumberL - 3rd party client nbr check aResult  = %d" , aResult );
+OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_CHECKEMERGENCYNUMBERL_2, "TSY: CMmCustomTsy::CheckEmergencyNumberL - 3rd party client nbr check aResult  = %d" , aResult );
         iEmergencyNumberCheckMode   = aNumberMode;
         iEmergencyNumberCheckResult = aResult;
 
@@ -3766,7 +3771,7 @@
     //Normal case
     else
         {
-TFLOGSTRING2("TSY: CMmCustomTsy::CheckEmergencyNumberL - aResult  = %d" , aResult );
+OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_CHECKEMERGENCYNUMBERL_3, "TSY: CMmCustomTsy::CheckEmergencyNumberL - aResult  = %d" , aResult );
 
         if ( ( 0 < requestHandle || iISVDialNumberCheck ) && 0 != aTsyReqHandle )
             {
@@ -3814,7 +3819,7 @@
     TInt aErrorValue )
     {
 
-TFLOGSTRING("TSY: CMmCustomTsy::CompleteCheckEmergencyNumber" );
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_COMPLETECHECKEMERGENCYNUMBER_1, "TSY: CMmCustomTsy::CompleteCheckEmergencyNumber" );
 
     // 3rd party number check completion0
     if( iISVDialNumberCheck )
@@ -3836,7 +3841,7 @@
     // check is the Dial cancel NULL
     if( iISVDialNumberCheckObject )
       {
-TFLOGSTRING2("TSY: CMmCustomTsy::CompleteCheckEmergencyNumber - Complete3rdPartyCallNbrCheck isEmergencyNbr = %d",isEmergencyNbr );
+OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_COMPLETECHECKEMERGENCYNUMBER_2, "TSY: CMmCustomTsy::CompleteCheckEmergencyNumber - Complete3rdPartyCallNbrCheck isEmergencyNbr = %d",isEmergencyNbr );
       iISVDialNumberCheckObject->Complete3rdPartyCallNbrCheck(
         isEmergencyNbr );
       }
@@ -3870,7 +3875,7 @@
             *iEmergencyNumberCheckResult = EFalse;
             }
         }
-TFLOGSTRING2("TSY: CMmCustomTsy::CompleteCheckEmergencyNumber number=%S", &(iEmergencyNumberCheckMode->iNumber) );
+OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_COMPLETECHECKEMERGENCYNUMBER_3, "TSY: CMmCustomTsy::CompleteCheckEmergencyNumber number=%S", (iEmergencyNumberCheckMode->iNumber) );
 
         // reset the internal variable
         iEmergencyNumberCheckResult = NULL;
@@ -3987,13 +3992,13 @@
     // used phonebook is Adn
     if ( 0 == aPndName->CompareF( KETelIccAdnPhoneBook ) )
         {
-TFLOGSTRING2("TSY: CMmCustomTsy::GetPndCacheStatus - ADN phonebook status: %d", iAdnCacheStatus);
+OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_GETPNDCACHESTATUS_1, "TSY: CMmCustomTsy::GetPndCacheStatus - ADN phonebook status: %d", iAdnCacheStatus);
         *aPndStatus = iAdnCacheStatus;
         }
     // used phonebook is Fdn
     else if ( 0 == aPndName->CompareF( KETelIccFdnPhoneBook ) )
         {
-TFLOGSTRING2("TSY: CMmCustomTsy::GetPndCacheStatus - FDN phonebook status: %d", iFdnCacheStatus);
+OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_GETPNDCACHESTATUS_2, "TSY: CMmCustomTsy::GetPndCacheStatus - FDN phonebook status: %d", iFdnCacheStatus);
         *aPndStatus = iFdnCacheStatus;
         }
     // used phonebook doesn't have cache
@@ -4001,12 +4006,12 @@
               ( 0 == aPndName->CompareF( KETelIccSdnPhoneBook ) ) ||
               ( 0 == aPndName->CompareF( KETelIccVoiceMailBox ) ) )
         {
-TFLOGSTRING2("TSY: CMmCustomTsy::GetPndCacheStatus - No cache for: %S ", aPndName);
+OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_GETPNDCACHESTATUS_3, "TSY: CMmCustomTsy::GetPndCacheStatus - No cache for: %S ", *aPndName);
         *aPndStatus = RMmCustomAPI::ECacheNotUsed;
         }
     else
         {
-TFLOGSTRING2("TSY: CMmCustomTsy::GetPndCacheStatus - No cache found for: %S ", aPndName);        
+OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_GETPNDCACHESTATUS_4, "TSY: CMmCustomTsy::GetPndCacheStatus - No cache found for: %S ", *aPndName);
         error = KErrArgument;
         }
 
@@ -4025,7 +4030,7 @@
     RMmCustomAPI::TPndCacheStatus aPndStatus,
     TName& aPndName )
     {
-TFLOGSTRING3("TSY: CMmCustomTsy::UpdateCacheStatus - Phonebook: %S status: %d", &aPndName, aPndStatus);
+OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_UPDATECACHESTATUS_1, "TSY: CMmCustomTsy::UpdateCacheStatus - Phonebook: %S status: %d", aPndName, aPndStatus);
     // if used phonebook is Adn
     if ( 0 == aPndName.CompareF( KETelIccAdnPhoneBook ) )
         {
@@ -4133,7 +4138,7 @@
 TInt CMmCustomTsy::SsAdditionalInfoNotification(
     RMmCustomAPI::TSsAdditionalInfo* aSsAdditionalInfo )
     {
-TFLOGSTRING("TSY: CMmCustomTsy::SsAdditionalInfoNotification");
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_SSADDITIONALINFONOTIFICATION_1, "TSY: CMmCustomTsy::SsAdditionalInfoNotification");
     iRetSsAdditionalInfo = aSsAdditionalInfo;
     iReqHandleType = ECustomTsyNotifySsAdditionalInfo;
 
@@ -4149,7 +4154,7 @@
 TInt CMmCustomTsy::SsAdditionalInfoNotificationCancel(
     const TTsyReqHandle )
     {
-TFLOGSTRING("TSY: CMmCustomTsy::SsAdditionalInfoNotificationCancel");
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_SSADDITIONALINFONOTIFICATIONCANCEL_1, "TSY: CMmCustomTsy::SsAdditionalInfoNotificationCancel");
     iRetSsAdditionalInfo = NULL;
 
     // reset reqhandle
@@ -4174,7 +4179,7 @@
     RMmCustomAPI::TSsAdditionalInfo* aSsAdditionalInfo,
     TInt aError )
     {
-TFLOGSTRING("TSY: CMmCustomTsy::CompleteSsAdditionalInfoNotification");
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_COMPLETESSADDITIONALINFONOTIFICATION_1, "TSY: CMmCustomTsy::CompleteSsAdditionalInfoNotification");
     // reset req handle. Returns the deleted req handle
     TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle(
         ECustomTsyNotifySsAdditionalInfo );
@@ -4205,7 +4210,7 @@
     const TTsyReqHandle aTsyReqHandle,
     RMmCustomAPI::TTwoDigitDialSupport* aSupport )
     {
-TFLOGSTRING("TSY: CMmCustomTsy::CheckTwoDigitDialSupportL");
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_CHECKTWODIGITDIALSUPPORTL_1, "TSY: CMmCustomTsy::CheckTwoDigitDialSupportL");
     // save pointer to client space
     iTwoDigitDialSupport = aSupport;
 
@@ -4646,7 +4651,7 @@
 TInt CMmCustomTsy::ResetNetServerL(
     const TTsyReqHandle aTsyReqHandle )
     {
-TFLOGSTRING("TSY: CMmCustomTsy::ResetNetServerL");
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_RESETNETSERVERL_1, "TSY: CMmCustomTsy::ResetNetServerL");
     // call DOS (no packed parameters)
     TInt ret = Phone()->MessageManager()->HandleRequestL(
         ECustomResetNetServerIPC );
@@ -4673,7 +4678,7 @@
 void CMmCustomTsy::CompleteResetNetServer(
     TInt aErrorValue )
     {
-TFLOGSTRING2("TSY: CMmCustomTsy::CompleteResetNetServer - Error: %d", aErrorValue );
+OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_COMPLETERESETNETSERVER_1, "TSY: CMmCustomTsy::CompleteResetNetServer - Error: %d", aErrorValue );
     // reset the reqhandle
     TTsyReqHandle tsyReqHandle =
         iTsyReqHandleStore->ResetTsyReqHandle( ECustomTsyResetNetServer );
@@ -4689,7 +4694,7 @@
             aErrorValue = KErrNotReady; 
             }
             
-TFLOGSTRING2("TSY: CMmCustomTsy::CompleteResetNetServer - complete with error value: %d", aErrorValue );
+OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_COMPLETERESETNETSERVER_2, "TSY: CMmCustomTsy::CompleteResetNetServer - complete with error value: %d", aErrorValue );
         ReqCompleted( tsyReqHandle, aErrorValue );
         }
     }
@@ -4741,7 +4746,7 @@
     // If SIM is inserted complete network connection failure
     if ( iMmPhoneTsy->NosBootState()->iSIMReady )
         {
-TFLOGSTRING("TSY: CMmCustomTsy::CompleteNotifyNetworkConnectionFailure");
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_COMPLETENOTIFYNETWORKCONNECTIONFAILURE_1, "TSY: CMmCustomTsy::CompleteNotifyNetworkConnectionFailure");
         // reset the reqhandle
         TTsyReqHandle tsyReqHandle =
             iTsyReqHandleStore->ResetTsyReqHandle(
@@ -5007,7 +5012,7 @@
     const TTsyReqHandle aTsyReqHandle,
     TUint32* aNetworkMode )
     {
-TFLOGSTRING("CMmCustomTsy::GetCurrentSystemNetworkModeL");
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_GETCURRENTSYSTEMNETWORKMODEL_1, "CMmCustomTsy::GetCurrentSystemNetworkModeL");
     TTsyReqHandle reqhandle = iTsyReqHandleStore->GetTsyReqHandle(
         ECustomTsyGetCurrentSystemNetworkMode );
 
@@ -5047,7 +5052,7 @@
 TInt CMmCustomTsy::GetCurrentSystemNetworkModeCancel(
     const TTsyReqHandle aTsyReqHandle )
     {
-TFLOGSTRING("CMmCustomTsy::GetCurrentSystemNetworkModeCancel");
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_GETCURRENTSYSTEMNETWORKMODECANCEL_1, "CMmCustomTsy::GetCurrentSystemNetworkModeCancel");
 
     // reset pointer to client data
     iCurrentNetworkMode = NULL;
@@ -5075,7 +5080,7 @@
     TDes8* aSimFileInfoPckg,
     TDes8* aSimResponseBuffer )
     {
-TFLOGSTRING( "TSY: CMmCustomTsy::GetSimFileInfoL" );
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_GETSIMFILEINFOL_1,  "TSY: CMmCustomTsy::GetSimFileInfoL" );
     TTsyReqHandle reqHandle =
         iTsyReqHandleStore->GetTsyReqHandle( ECustomTsyGetSimFileInfo );
 
@@ -5096,7 +5101,7 @@
         	&& ( iGetSimFileInfoReq.iOffSet == simFileInfo.iOffSet )
         	&& ( iGetSimFileInfoReq.iSize == simFileInfo.iSize ) )
         	{
-TFLOGSTRING( "TSY: CMmCustomTsy::GetSimFileInfoL - Same info already requested" );
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_GETSIMFILEINFOL_2,  "TSY: CMmCustomTsy::GetSimFileInfoL - Same info already requested" );
 
 			TGetSimFileInfoRequest* req = new ( ELeave ) TGetSimFileInfoRequest();
 			req->iReqHandle = aTsyReqHandle;
@@ -5126,7 +5131,7 @@
             }
         else
             {
-TFLOGSTRING( "TSY: CMmCustomTsy::GetSimFileInfoL - Save handle" );
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_GETSIMFILEINFOL_3,  "TSY: CMmCustomTsy::GetSimFileInfoL - Save handle" );
 	        // Save the req handle type
 	        iReqHandleType = ECustomTsyGetSimFileInfo;
 			// Save request in queue for completion
@@ -5148,7 +5153,7 @@
 //
 TInt CMmCustomTsy::GetSimFileInfoCancel( TTsyReqHandle aTsyReqHandle )
     {
-TFLOGSTRING( "TSY: CMmCustomTsy::GetSimFileInfoCancel" );
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_GETSIMFILEINFOCANCEL_1,  "TSY: CMmCustomTsy::GetSimFileInfoCancel" );
     
 	for ( TInt i = 0; i < iGetSimFileInfoRequests.Count(); i++ )
 		{
@@ -5189,7 +5194,7 @@
     TDesC8* aData,
     TInt aError )
     {
-TFLOGSTRING( "TSY: CMmCustomTsy::CompleteGetSimFileInfo" );
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_COMPLETEGETSIMFILEINFO_1,  "TSY: CMmCustomTsy::CompleteGetSimFileInfo" );
     
     // reset the reqhandle
     TTsyReqHandle tsyReqHandle =
@@ -5200,7 +5205,7 @@
         {
         // complete
         TInt getSimFileInfoRequestsCount = iGetSimFileInfoRequests.Count();
-TFLOGSTRING2( "TSY: CMmCustomTsy::CompleteGetSimFileInfo - Complete %d requests", getSimFileInfoRequestsCount );
+OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_COMPLETEGETSIMFILEINFO_2,  "TSY: CMmCustomTsy::CompleteGetSimFileInfo - Complete %d requests", getSimFileInfoRequestsCount );
         
 		for ( TInt i = 0; i < getSimFileInfoRequestsCount; i++ )
 		    {
@@ -5244,10 +5249,10 @@
     {
     
     TInt ret( KErrNone );
-    TFLOGSTRING ("TSY: CMmCustomTsy::GetLifeTimeL");
+    OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_GETLIFETIMEL_1, "TSY: CMmCustomTsy::GetLifeTimeL");
     if ( sizeof(RMmCustomAPI::TLifeTimeData) != aLifeTimerInfoPckg->MaxLength() )
         {
-        TFLOGSTRING ("TSY: CMmCustomTsy::GetLifeTimeL bad size argument");
+        OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_GETLIFETIMEL_2, "TSY: CMmCustomTsy::GetLifeTimeL bad size argument");
         // Complete the request with appropiate error        
         return KErrArgument;
         }
@@ -5255,7 +5260,7 @@
             ECustomTsyGetLifeTimerInfo  );
     if ( ECustomTsyReqHandleUnknown != reqHandle ) 
         {
-TFLOGSTRING( "TSY: CMmCustomTsy::GetLifeTimeL - ECustomTsyReqHandleUnknown" );
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_GETLIFETIMEL_3,  "TSY: CMmCustomTsy::GetLifeTimeL - ECustomTsyReqHandleUnknown" );
         // The request is already in processing because of previous request.
         // Complete request with status value informing the client about 
         // the situation.
@@ -5265,7 +5270,7 @@
         {
         // save pointer to the packaged life timer info
         iLifeTimerInfoPckg = aLifeTimerInfoPckg;
-        TFLOGSTRING( "TSY: CMmCustomTsy::GetLifeTimeL - send request" );
+        OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_GETLIFETIMEL_4,  "TSY: CMmCustomTsy::GetLifeTimeL - send request" );
         iTsyReqHandleStore->SetTsyReqHandle( 
                         ECustomTsyGetLifeTimerInfo, aTsyReqHandle );
         ret = Phone()->MessageManager()->HandleRequestL(
@@ -5273,13 +5278,13 @@
         // Check response of the extension
         if ( KErrNone != ret )
             {
-            TFLOGSTRING( "TSY: CMmCustomTsy::GetLifeTimeL - DOS layer returned error " );
+            OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_GETLIFETIMEL_5,  "TSY: CMmCustomTsy::GetLifeTimeL - DOS layer returned error " );
             TTsyReqHandle tsyReqHandle =
                 iTsyReqHandleStore->ResetTsyReqHandle( 
                                     ECustomTsyGetLifeTimerInfo );
             if ( ECustomTsyReqHandleUnknown != tsyReqHandle )
                 {
-                TFLOGSTRING( "TSY: CMmCustomTsy::GetLifeTimeL - DOS error - unknown handle" );
+                OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_GETLIFETIMEL_6,  "TSY: CMmCustomTsy::GetLifeTimeL - DOS error - unknown handle" );
                 }
             ReqCompleted( aTsyReqHandle, ret );
             }
@@ -5365,7 +5370,7 @@
     const TTsyReqHandle aTsyReqHandle,
     RMmCustomAPI::TSetDriveMode* aModeStatus )
     {
-TFLOGSTRING3("TSY: CMmCustomTsy::SetDriveModeL - Req handle: %d, Mode status: %d", aTsyReqHandle, *aModeStatus );
+OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_SETDRIVEMODEL_1, "TSY: CMmCustomTsy::SetDriveModeL - Req handle: %d, Mode status: %d", aTsyReqHandle, *aModeStatus );
 	if ( (iUsingFeatureManager) && (iFeatureControl.FeatureSupported(NFeature::KDriveModeCanRestrictMtCalls) == KFeatureSupported) )
         {
         // get the handle
@@ -5420,7 +5425,7 @@
 void CMmCustomTsy::CompleteSetDriveMode(
     TInt aErrorCode )
     {
-TFLOGSTRING2( "TSY: CMmCustomTsy::CompleteSetDriveMode - Error code: %d", aErrorCode );
+OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_COMPLETESETDRIVEMODE_1,  "TSY: CMmCustomTsy::CompleteSetDriveMode - Error code: %d", aErrorCode );
 	if ( (iUsingFeatureManager) && (iFeatureControl.FeatureSupported(NFeature::KDriveModeCanRestrictMtCalls) == KFeatureSupported) )
         {
         //Reset req handle, returns the deleted req handle
@@ -5593,7 +5598,7 @@
 void CMmCustomTsy::SetObjectForISVDialNumberCheck(
     CMmVoiceCallTsy* aCallObject )
     {
-TFLOGSTRING2("TSY: CMmCustomTsy::SetObjectForISVDialNumberCheck aCallObject=%x", aCallObject );
+OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_SETOBJECTFORISVDIALNUMBERCHECK_1, "TSY: CMmCustomTsy::SetObjectForISVDialNumberCheck aCallObject=0x%08x", aCallObject );
     //Save pointer for completion of check emergency number
     iISVDialNumberCheckObject = aCallObject;
     //ISV dial has been requested
@@ -5609,7 +5614,7 @@
 TInt CMmCustomTsy::NotifyRauEvent(
     RMmCustomAPI::TRauEventStatus* aEventStatus )
     {
-TFLOGSTRING("TSY: CMmCustomTsy::NotifyRauEvent");
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_NOTIFYRAUEVENT_1, "TSY: CMmCustomTsy::NotifyRauEvent");
 
     // save pointer to client data
     iRauEventStatus = aEventStatus;
@@ -5630,7 +5635,7 @@
     RMmCustomAPI::TRauEventStatus aEventStatus,
     TInt aErrorCode )
     {
-TFLOGSTRING("TSY: CMmCustomTsy::CompleteNotifyRauEvent");
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_COMPLETENOTIFYRAUEVENT_1, "TSY: CMmCustomTsy::CompleteNotifyRauEvent");
 
     TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle(
         ECustomTsyNotifyRauEvent );
@@ -5686,7 +5691,7 @@
     const TTsyReqHandle aTsyReqHandle,
     RMmCustomAPI::THSxPAStatus* aHSxPAStatus )
     {
-TFLOGSTRING("TSY: CMmCustomTsy::ReadHSxPAStatusL");
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_READHSXPASTATUSL_1, "TSY: CMmCustomTsy::ReadHSxPAStatusL");
 
     TTsyReqHandle reqHandle = iTsyReqHandleStore->GetTsyReqHandle(
         ECustomTsyReadHSxPAStatus );
@@ -5729,7 +5734,7 @@
     CMmDataPackage* aDataPackage,
     TInt aErrorCode )
     {
-TFLOGSTRING("TSY: CMmCustomTsy::CompleteReadHSxPAStatus");
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_COMPLETEREADHSXPASTATUS_1, "TSY: CMmCustomTsy::CompleteReadHSxPAStatus");
 
     TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle(
         ECustomTsyReadHSxPAStatus );
@@ -5741,7 +5746,7 @@
             RMmCustomAPI::THSxPAStatus status;
             aDataPackage->UnPackData( status );
 
-TFLOGSTRING2("TSY: CMmCustomTsy::CompleteReadHSxPAStatus, status = %d", status);
+OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_COMPLETEREADHSXPASTATUS_2, "TSY: CMmCustomTsy::CompleteReadHSxPAStatus, status = %d", status);
 
             // Save the status.
             iHSxPAStatus = status;
@@ -5770,7 +5775,7 @@
 //
 TInt CMmCustomTsy::ReadHSxPAStatusCancel()
     {
-TFLOGSTRING("TSY: CMmCustomTsy::ReadHSxPAStatusCancel");
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_READHSXPASTATUSCANCEL_1, "TSY: CMmCustomTsy::ReadHSxPAStatusCancel");
 
     // reset the reqhandle
     TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle(
@@ -5797,7 +5802,7 @@
     const TTsyReqHandle aTsyReqHandle,
     RMmCustomAPI::THSxPAStatus* aHSxPAStatus )
     {
-TFLOGSTRING2("TSY: CMmCustomTsy::WriteHSxPAStatusL. New status: %d", *aHSxPAStatus);
+OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_WRITEHSXPASTATUSL_1, "TSY: CMmCustomTsy::WriteHSxPAStatusL. New status: %d", *aHSxPAStatus);
 
     iSetHSxPAStatus = aHSxPAStatus;
 
@@ -5840,7 +5845,7 @@
 void CMmCustomTsy::CompleteWriteHSxPAStatus(
     TInt aErrorCode )
     {
-TFLOGSTRING("TSY: CMmCustomTsy::CompleteWriteHSxPAStatus");
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_COMPLETEWRITEHSXPASTATUS_1, "TSY: CMmCustomTsy::CompleteWriteHSxPAStatus");
 
     //reset req handle.
     TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle(
@@ -5869,7 +5874,7 @@
 //
 TInt CMmCustomTsy::WriteHSxPAStatusCancel()
     {
-TFLOGSTRING("TSY: CMmCustomTsy::WriteHSxPAStatusCancel");
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_WRITEHSXPASTATUSCANCEL_1, "TSY: CMmCustomTsy::WriteHSxPAStatusCancel");
 
     // reset the reqhandle
     TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle(
@@ -5895,7 +5900,7 @@
 TInt CMmCustomTsy::NotifyHSxPAStatus(
     RMmCustomAPI::THSxPAStatus* aHSxPAStatus )
     {
-TFLOGSTRING("TSY: CMmCustomTsy::NotifyHSxPAStatus");
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_NOTIFYHSXPASTATUS_1, "TSY: CMmCustomTsy::NotifyHSxPAStatus");
 
     // save pointer to client data
     iRetNotifyHSxPAStatus = aHSxPAStatus;
@@ -5916,13 +5921,13 @@
     CMmDataPackage* aDataPackage,
     TInt aErrorCode )
     {
-TFLOGSTRING2("TSY: CMmCustomTsy::CompleteNotifyHSxPAStatus, Error: %d", aErrorCode);
+OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_COMPLETENOTIFYHSXPASTATUS_1, "TSY: CMmCustomTsy::CompleteNotifyHSxPAStatus, Error: %d", aErrorCode);
 
     RMmCustomAPI::THSxPAStatus status;
     aDataPackage->UnPackData( status );
 
-TFLOGSTRING2("TSY: CMmCustomTsy::CompleteNotifyHSxPAStatus, old status: %d", iHSxPAStatus);
-TFLOGSTRING2("TSY: CMmCustomTsy::CompleteNotifyHSxPAStatus, new status: %d", status);
+OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_COMPLETENOTIFYHSXPASTATUS_2, "TSY: CMmCustomTsy::CompleteNotifyHSxPAStatus, old status: %d", iHSxPAStatus);
+OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_COMPLETENOTIFYHSXPASTATUS_3, "TSY: CMmCustomTsy::CompleteNotifyHSxPAStatus, new status: %d", status);
 
     // check if status was changed
     if ( iHSxPAStatus != status )
@@ -5965,7 +5970,7 @@
 //
 TInt CMmCustomTsy::NotifyHSxPAStatusCancel()
     {
-TFLOGSTRING("TSY: CMmCustomTsy::NotifyHSxPAStatusCancel");
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_NOTIFYHSXPASTATUSCANCEL_1, "TSY: CMmCustomTsy::NotifyHSxPAStatusCancel");
 
     // reset the reqhandle
     TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle(
@@ -5992,7 +5997,7 @@
     TTsyReqHandle /*aTsyReqHandle*/,
     TDes8* aCFIndicators )
     {
-TFLOGSTRING("TSY: CMmCustomTsy::GetIccCallForwardingStatusL");
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_GETICCCALLFORWARDINGSTATUSL_1, "TSY: CMmCustomTsy::GetIccCallForwardingStatusL");
 
     TInt ret( KErrGeneral );
 
@@ -6038,7 +6043,7 @@
     CMmDataPackage* aDataPackage,
     TInt aErrorCode )
     {
-TFLOGSTRING2("TSY: CMmCustomTsy::CompleteGetIccCallForwardingStatus, aErrorCode=%d", aErrorCode );
+OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_COMPLETEGETICCCALLFORWARDINGSTATUS_1, "TSY: CMmCustomTsy::CompleteGetIccCallForwardingStatus, aErrorCode=%d", aErrorCode );
 
     //reset req handle.
     TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle(
@@ -6053,7 +6058,7 @@
             RMmCustomAPI::TCFIndicators& tcfIndicator = ( *tcfIndicatorPckg )();
 
             aDataPackage->UnPackData( iCurrentTCFIndicator );
-TFLOGSTRING2("TSY: CMmCustomTsy::CompleteGetIccCallForwardingStatus, indicator=%u", iCurrentTCFIndicator.iIndicator );
+OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_COMPLETEGETICCCALLFORWARDINGSTATUS_2, "TSY: CMmCustomTsy::CompleteGetIccCallForwardingStatus, indicator=%u", iCurrentTCFIndicator.iIndicator );
 
             tcfIndicator.iIndicator = iCurrentTCFIndicator.iIndicator;
                 tcfIndicator.iCFNumber.iTypeOfNumber =
@@ -6066,7 +6071,7 @@
 	        // Update CenRep with latest valid data
 	        if( &iCurrentTCFIndicator )
 	            {
-TFLOGSTRING("TSY: CMmCustomTsy::CompleteGetIccCallForwardingStatus : Update Central Repository");
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_COMPLETEGETICCCALLFORWARDINGSTATUS_3, "TSY: CMmCustomTsy::CompleteGetIccCallForwardingStatus : Update Central Repository");
 	            TPckg<TUint32> tempPckg( iCurrentTCFIndicator.iIndicator );
 	            iCFISCentRep->Set( KCtsyCallForwardingIndicator, tempPckg );
 	
@@ -6091,9 +6096,9 @@
             {
             iGetIccCfStatusBootUp = EFalse;
             aDataPackage->UnPackData( iCurrentTCFIndicator );
-TFLOGSTRING("TSY: CMmCustomTsy::CompleteGetIccCallForwardingStatus CenRep key UnconditionalCFStatus not RESETED.");     
-
-TFLOGSTRING2("TSY: CMmCustomTsy::CompleteGetIccCallForwardingStatus : Bootup case, KCtsyCallForwardingIndicator indicator=%u", iCurrentTCFIndicator.iIndicator );
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_COMPLETEGETICCCALLFORWARDINGSTATUS_4, "TSY: CMmCustomTsy::CompleteGetIccCallForwardingStatus CenRep key UnconditionalCFStatus not RESETED.");
+
+OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_COMPLETEGETICCCALLFORWARDINGSTATUS_5, "TSY: CMmCustomTsy::CompleteGetIccCallForwardingStatus : Bootup case, KCtsyCallForwardingIndicator indicator=%u", iCurrentTCFIndicator.iIndicator );
 
             TPckg<TUint32> tempPckg( iCurrentTCFIndicator.iIndicator );
             iCFISCentRep->Set( KCtsyCallForwardingIndicator, tempPckg );
@@ -6103,7 +6108,7 @@
             iCurrentTCFIndicator.iCFNumber.iTelNumber );
             iCFISPrivateCentRep->Set( KCtsyCallForwardingMspId,
             iCurrentTCFIndicator.iMultipleSubscriberProfileID );
-TFLOGSTRING("TSY: CMmCustomTsy::CompleteGetIccCallForwardingStatus CenRep updated."); 			
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_COMPLETEGETICCCALLFORWARDINGSTATUS_6, "TSY: CMmCustomTsy::CompleteGetIccCallForwardingStatus CenRep updated.");
             }
         }
     }
@@ -6117,7 +6122,7 @@
 TInt CMmCustomTsy::GetIccCallForwardingStatusCancel(
 	const TTsyReqHandle aTsyReqHandle )
     {
-TFLOGSTRING("CMmCustomTsy::GetIccCallForwardingStatusCancel");
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_GETICCCALLFORWARDINGSTATUSCANCEL_1, "CMmCustomTsy::GetIccCallForwardingStatusCancel");
 	// reset reqhandle
 	iTsyReqHandleStore->ResetTsyReqHandle(
 			ECustomTsyGetIccCallForwardingStatus );
@@ -6179,7 +6184,7 @@
     CMmDataPackage* aDataPackage,
     TInt aErrorCode )
     {
-TFLOGSTRING2("TSY: CMmCustomTsy::CompleteNotifyIccCallForwardingStatusChange, Error: %d", aErrorCode);
+OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_COMPLETENOTIFYICCCALLFORWARDINGSTATUSCHANGE_1, "TSY: CMmCustomTsy::CompleteNotifyIccCallForwardingStatusChange, Error: %d", aErrorCode);
 
     RMmCustomAPI::TCFIndicators tempNotifyCFIndicator;
     aDataPackage->UnPackData( tempNotifyCFIndicator );
@@ -6199,7 +6204,7 @@
 
             TPckg<TUint32> tempPckg( iCurrentTCFIndicator.iIndicator );
 			iCFISCentRep->Set( KCtsyCallForwardingIndicator, tempPckg );	
-TFLOGSTRING2("TSY: CMmCustomTsy::CompleteNotifyIccCallForwardingStatusChange : Update CenRep, KCtsyCallForwardingIndicator indicator=%u", iCurrentTCFIndicator.iIndicator );
+OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_COMPLETENOTIFYICCCALLFORWARDINGSTATUSCHANGE_2, "TSY: CMmCustomTsy::CompleteNotifyIccCallForwardingStatusChange : Update CenRep, KCtsyCallForwardingIndicator indicator=%u", iCurrentTCFIndicator.iIndicator );
 				
         	iCFISPrivateCentRep->Set( KCtsyCallForwardingNumberPlan, 
         	    iCurrentTCFIndicator.iCFNumber.iNumberPlan );
@@ -6210,7 +6215,7 @@
         	iCFISPrivateCentRep->Set( KCtsyCallForwardingMspId, 
         	    iCurrentTCFIndicator.iMultipleSubscriberProfileID );
             //CenRep updated
-TFLOGSTRING("TSY: CMmCustomTsy::CompleteNotifyIccCallForwardingStatusChange CenRep updated."); 	            
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_COMPLETENOTIFYICCCALLFORWARDINGSTATUSCHANGE_3, "TSY: CMmCustomTsy::CompleteNotifyIccCallForwardingStatusChange CenRep updated.");
             }
 
         // Check if notification was requested
@@ -6309,7 +6314,7 @@
 TInt CMmCustomTsy::GetCellInfoL(
     TDes8* aCellInfoPckg )
     {
-TFLOGSTRING("TSY: CMmCustomTsy::GetCellInfo");
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_GETCELLINFOL_1, "TSY: CMmCustomTsy::GetCellInfo");
 
     TInt ret = KErrServerBusy;
 
@@ -6349,7 +6354,7 @@
 //
 TInt CMmCustomTsy::GetCellInfoCancel()
     {
-TFLOGSTRING("TSY: CMmCustomTsy::GetCellInfoCancel");
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_GETCELLINFOCANCEL_1, "TSY: CMmCustomTsy::GetCellInfoCancel");
 
     // reset the req handle
     TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle(
@@ -6377,7 +6382,7 @@
     RMmCustomAPI::TMmCellInfo* aCellInfo,
     TInt aErrorValue )
     {
-TFLOGSTRING2("TSY: CMmCustomTsy::CompleteGetCellInfo - aErrorValue %d", aErrorValue);
+OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_COMPLETEGETCELLINFO_1, "TSY: CMmCustomTsy::CompleteGetCellInfo - aErrorValue %d", aErrorValue);
 
     // reset the req handle
     TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle(
@@ -6408,7 +6413,7 @@
 TInt CMmCustomTsy::NotifyCellInfoChange(
     TDes8* aCellInfoPckg )
     {
-TFLOGSTRING("TSY: CMmCustomTsy::NotifyCellInfoChange");
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_NOTIFYCELLINFOCHANGE_1, "TSY: CMmCustomTsy::NotifyCellInfoChange");
    
     RMmCustomAPI::TMmCellInfo temp;
 	RMmCustomAPI::TMmCellInfoPckg tempPckg(temp);
@@ -6438,7 +6443,7 @@
     RMmCustomAPI::TMmCellInfo* aCellInfo,
     TInt aErrorCode )
     {
-TFLOGSTRING2("TSY: CMmCustomTsy::CompleteNotifyCellInfoChange Error: %d", aErrorCode);
+OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_COMPLETENOTIFYCELLINFOCHANGE_1, "TSY: CMmCustomTsy::CompleteNotifyCellInfoChange Error: %d", aErrorCode);
 
     // Check if notification was requested
 	TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle(
@@ -6470,7 +6475,7 @@
 //
 TInt CMmCustomTsy::NotifyCellInfoChangeCancel()
     {
-TFLOGSTRING("TSY: CMmCustomTsy::NotifyCellInfoChangeCancel");
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_NOTIFYCELLINFOCHANGECANCEL_1, "TSY: CMmCustomTsy::NotifyCellInfoChangeCancel");
 
     // reset the reqhandle
     TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle(
@@ -6496,7 +6501,7 @@
 RMmCustomAPI::TPndCacheStatus CMmCustomTsy::GetPhonebookCacheStatus( 
     TUint8 aPhoneBookType )
     {
-TFLOGSTRING("TSY: CMmCustomTsy::GetPhonebookCacheStatus");
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_GETPHONEBOOKCACHESTATUS_1, "TSY: CMmCustomTsy::GetPhonebookCacheStatus");
     RMmCustomAPI::TPndCacheStatus ret( RMmCustomAPI::ECacheNotUsed );
 
     switch ( aPhoneBookType )
@@ -6526,7 +6531,7 @@
 void CMmCustomTsy::ReqCompleted( const TTsyReqHandle aTsyReqHandle,
     const TInt aError )
     {
-TFLOGSTRING3("TSY: CMmCustomTsy::ReqCompleted, aTsyReqHandle=%d, aError=%d", aTsyReqHandle, aError );
+OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_REQCOMPLETED_1, "TSY: CMmCustomTsy::ReqCompleted, aTsyReqHandle=%d, aError=%d", aTsyReqHandle, aError );
 
 	CTelObject::ReqCompleted ( aTsyReqHandle, aError );
 	}
@@ -6542,7 +6547,7 @@
     RMmCustomAPI::TBandSelection* aSystemNetworkBand,
     RMmCustomAPI::TNetworkModeCaps* aSystemNetworkMode )
     {
-TFLOGSTRING("TSY: CMmCustomTsy::GetSystemNetworkBandL");
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_GETSYSTEMNETWORKBANDL_1, "TSY: CMmCustomTsy::GetSystemNetworkBandL");
     TTsyReqHandle reqhandle = iTsyReqHandleStore->GetTsyReqHandle(
         ECustomTsyGetSystemNetworkBand );
 
@@ -6588,7 +6593,7 @@
     RMmCustomAPI::TNetworkModeCaps aSystemNetworkMode,
     TInt aResult )
     {
-TFLOGSTRING2("TSY: CMmCustomTsy::CompleteGetSystemNetworkBand. Result: %d", aResult);
+OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_COMPLETEGETSYSTEMNETWORKBAND_1, "TSY: CMmCustomTsy::CompleteGetSystemNetworkBand. Result: %d", aResult);
     // reset req handle. Returns the deleted req handle
     TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle(
         ECustomTsyGetSystemNetworkBand );
@@ -6621,7 +6626,7 @@
 TInt CMmCustomTsy::GetSystemNetworkBandCancel(
     const TTsyReqHandle aTsyReqHandle )
     {
-TFLOGSTRING("TSY: CMmCustomTsy::GetSystemNetworkBandCancel");
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_GETSYSTEMNETWORKBANDCANCEL_1, "TSY: CMmCustomTsy::GetSystemNetworkBandCancel");
     // reset the pointer to client data
     iAvailableSystemNetworkBand = NULL;
     iSystemNetworkModeCaps = NULL;
@@ -6647,7 +6652,7 @@
     RMmCustomAPI::TBandSelection* aSystemNetworkBand,
     RMmCustomAPI::TNetworkModeCaps* aSystemNetworkModeCaps )
     {
-TFLOGSTRING("TSY: CMmCustomTsy::SetSystemNetworkBandL");
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_SETSYSTEMNETWORKBANDL_1, "TSY: CMmCustomTsy::SetSystemNetworkBandL");
     TTsyReqHandle reqhandle = iTsyReqHandleStore->GetTsyReqHandle(
         ECustomTsySetSystemNetworkBand );
 
@@ -6697,7 +6702,7 @@
 void CMmCustomTsy::CompleteSetSystemNetworkBand(
     TInt aResult )
     {
-TFLOGSTRING("TSY: CMmCustomTsy::CompleteSetSystemNetworkBand");
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_COMPLETESETSYSTEMNETWORKBAND_1, "TSY: CMmCustomTsy::CompleteSetSystemNetworkBand");
     // reset req handle. Returns the deleted req handle
     TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle(
         ECustomTsySetSystemNetworkBand );
@@ -6718,7 +6723,7 @@
 //
 void CMmCustomTsy::SetIccCfBootUpFlag( TBool aBootUp )
     {
-TFLOGSTRING2("TSY: CMmCustomTsy::SetIccCfBootUpFlag, aBootUp=%d", aBootUp );
+OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_SETICCCFBOOTUPFLAG_1, "TSY: CMmCustomTsy::SetIccCfBootUpFlag, aBootUp=%d", aBootUp );
 
     iGetIccCfStatusBootUp = aBootUp;
     }
@@ -6732,7 +6737,7 @@
     const TTsyReqHandle aTsyReqHandle,
     RMmCustomAPI::TAppSupport* aAppSupport )
     {
-TFLOGSTRING("TSY: CMmCustomTsy::GetUSIMServiceSupportL");
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_GETUSIMSERVICESUPPORTL_1, "TSY: CMmCustomTsy::GetUSIMServiceSupportL");
 
     TTsyReqHandle reqHandle = iTsyReqHandleStore->GetTsyReqHandle(
         ECustomTsyGetUSIMServiceSupport );
@@ -6779,7 +6784,7 @@
     CMmDataPackage* aDataPackage,
     TInt aErrorCode )
     {
-TFLOGSTRING("TSY: CMmCustomTsy::CompleteGetUSIMServiceSupport");
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_COMPLETEGETUSIMSERVICESUPPORT_1, "TSY: CMmCustomTsy::CompleteGetUSIMServiceSupport");
 
     TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle(
         ECustomTsyGetUSIMServiceSupport );
@@ -6816,7 +6821,7 @@
 //
 TInt CMmCustomTsy::GetUSIMServiceSupportCancel()
     {
-TFLOGSTRING("TSY: CMmCustomTsy::GetUSIMServiceSupportCancel");
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_GETUSIMSERVICESUPPORTCANCEL_1, "TSY: CMmCustomTsy::GetUSIMServiceSupportCancel");
 
     // reset the reqhandle
     TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle(
@@ -6842,7 +6847,7 @@
 TInt CMmCustomTsy::NotifyRemoteAlertingToneStatusChange(
     RMmCustomAPI::TRemoteAlertingToneStatus* aToneStatus )
     {
-TFLOGSTRING("TSY: CMmCustomTsy::NotifyRemoteAlertingToneStatusChange");
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_NOTIFYREMOTEALERTINGTONESTATUSCHANGE_1, "TSY: CMmCustomTsy::NotifyRemoteAlertingToneStatusChange");
 
     // save pointer to client data
     iToneStatus = aToneStatus;
@@ -6863,7 +6868,7 @@
     RMmCustomAPI::TRemoteAlertingToneStatus aToneStatus,
     TInt aErrorCode )
     {
-TFLOGSTRING("TSY: CMmCustomTsy::CompleteNotifyRemoteAlertingToneStatusChange");
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMCUSTOMTSY_COMPLETENOTIFYREMOTEALERTINGTONESTATUSCHANGE_1, "TSY: CMmCustomTsy::CompleteNotifyRemoteAlertingToneStatusChange");
 
     TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle(
         ECustomTsyNotifyRemoteAlertingToneStatusChange );