Mercurial Mercurial > oss > MCL > sf > os > cellularsrv / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
telephonyserverplugins/common_tsy/commontsy/src/mmcustomtsy/CMmSIMTsy.cpp
branchRCL_3
changeset 19 630d2f34d719
parent 7 fe8b59ab9fa0
child 20 07a122eea281 
--- a/telephonyserverplugins/common_tsy/commontsy/src/mmcustomtsy/CMmSIMTsy.cpp	Thu Aug 19 11:03:36 2010 +0300
+++ b/telephonyserverplugins/common_tsy/commontsy/src/mmcustomtsy/CMmSIMTsy.cpp	Tue Aug 31 16:23:08 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,9 +16,14 @@
 
 
 //  INCLUDE FILES
+
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "CMmSIMTsyTraces.h"
+#endif
+
 #include "CMmSIMTsy.h"
 #include <ctsy/pluginapi/cmmdatapackage.h>
-#include <ctsy/tflogger.h>
 
 // ======== MEMBER FUNCTIONS ========
 
@@ -30,7 +35,7 @@
 void CMmSIMTsy::ConstructL(
     CMmCustomTsy* aMmCustomTsy )
     {
-TFLOGSTRING("TSY: CMmSIMTsy::ConstructL");         
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSIMTSY_CONSTRUCTL_1, "TSY: CMmSIMTsy::ConstructL");
     iMmCustomTsy = aMmCustomTsy;
 
     // Create req handle store
@@ -59,7 +64,7 @@
         ( KPhEngMaxViagHomeZones * KPhEngMaxCacheId ) ); );
     if ( leaveCode )
         {
-TFLOGSTRING2("TSY: CMmSIMTsy::ConstructL: Could not construct o2 HomeZone dynamic cache, error=%d", leaveCode);
+OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSIMTSY_CONSTRUCTL_2, "TSY: CMmSIMTsy::ConstructL: Could not construct o2 HomeZone dynamic cache, error=%d", leaveCode);
         iViagDynamicCache = NULL;
         }
     else
@@ -71,14 +76,14 @@
         iViagDynamicCache->AppendL( zero, ( KPhEngMaxViagHomeZones * 
             KPhEngMaxCacheId ) );
         iViagHomeZoneCacheReady = EFalse;
-TFLOGSTRING("TSY: CMmSIMTsy::ConstructL: o2 HomeZone dynamic cache array created.");
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSIMTSY_CONSTRUCTL_3, "TSY: CMmSIMTsy::ConstructL: o2 HomeZone dynamic cache array created.");
         }
     }
 
 CMmSIMTsy* CMmSIMTsy::NewL(
     CMmCustomTsy* aMmCustomTsy )
     {
-TFLOGSTRING("TSY: CMmSIMTsy::NewL");    
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSIMTSY_NEWL_1, "TSY: CMmSIMTsy::NewL");
     CMmSIMTsy* self = new (ELeave) CMmSIMTsy();
 
     CleanupStack::PushL( self );
@@ -90,7 +95,7 @@
 
 CMmSIMTsy::~CMmSIMTsy()
     {
-TFLOGSTRING("TSY: CMmSIMTsy::~CMmSIMTsy()");         
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSIMTSY_DTOR_1, "TSY: CMmSIMTsy::~CMmSIMTsy()");
     // delete all CB ID related
     ResetAndDestroySimCbTopics();
 
@@ -150,7 +155,7 @@
     const TInt aIpc, 
     const TDataPackage& aPackage )
     {
-TFLOGSTRING3("TSY: CMmSIMTsy::DoExtFuncL - IPC:%d Handle:%d", aIpc, aTsyReqHandle);
+OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSIMTSY_DOEXTFUNCL_1, "TSY: CMmSIMTsy::DoExtFuncL - IPC:%d Handle:%d", aIpc, aTsyReqHandle);
     TInt ret( KErrGeneral );
 
     // Ensure the ReqHandleType is unset.
@@ -370,7 +375,7 @@
     RMmCustomAPI::TViagParams* aViagParameters, 
     RMmCustomAPI::TViagElement* aViagElements )
     {
-TFLOGSTRING("TSY: CMmSIMTsy::ReadViagHomeZoneParamsL");
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSIMTSY_READVIAGHOMEZONEPARAMSL_1, "TSY: CMmSIMTsy::ReadViagHomeZoneParamsL");
     TInt ret( KErrNone);
 
     if ( ESIMTsyReqHandleUnknown != iTsyReqHandleStore->GetTsyReqHandle(
@@ -419,7 +424,7 @@
 //
 void CMmSIMTsy::CheckViagHomezoneParamsL()
     {
-TFLOGSTRING("TSY: CMmSIMTsy::CheckViagHomezoneParamsL");
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSIMTSY_CHECKVIAGHOMEZONEPARAMSL_1, "TSY: CMmSIMTsy::CheckViagHomezoneParamsL");
     // Check if the request is pending
     if ( ESIMTsyReqHandleUnknown != iTsyReqHandleStore->GetTsyReqHandle(
         ESIMRequestTypeReadParams )  && iViagParamsReadRequested )
@@ -428,7 +433,7 @@
         // read requests, set flag to EFalse.
         iViagParamsReadRequested = EFalse;
 
-TFLOGSTRING("TSY: CMmSIMTsy::CheckViagHomezoneParamsL - Sending request" );
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSIMTSY_CHECKVIAGHOMEZONEPARAMSL_2, "TSY: CMmSIMTsy::CheckViagHomezoneParamsL - Sending request" );
         // send request to DOS (no parameters)
         // Void return value, there is nothing to be done if request fails.
         (void) iMmCustomTsy->Phone()->MessageManager()->HandleRequestL(
@@ -436,7 +441,7 @@
         }
     else
         {
-TFLOGSTRING("TSY: CMmSIMTsy::CheckViagHomezoneParamsL - VIAG homezone params not requested");
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSIMTSY_CHECKVIAGHOMEZONEPARAMSL_3, "TSY: CMmSIMTsy::CheckViagHomezoneParamsL - VIAG homezone params not requested");
         }
 
     StartDynamicCachingL();
@@ -454,7 +459,7 @@
     RMmCustomAPI::TViagElements* aElems, 
     TInt aError )
     {
-TFLOGSTRING2("TSY: CMmSIMTsy::CompleteReadViagHomeZoneParamsResp - aError: %d", aError );
+OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSIMTSY_COMPLETEREADVIAGHOMEZONEPARAMSRESP_1, "TSY: CMmSIMTsy::CompleteReadViagHomeZoneParamsResp - aError: %d", aError );
     TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle(
         ESIMRequestTypeReadParams );
     if ( ESIMTsyReqHandleUnknown != reqHandle )
@@ -462,29 +467,29 @@
         if ( aError == KErrNone && iViagParams && iViagElems )
             {
             *iViagParams = *aParams;
-TFLOGSTRING2("TSY: CMmSIMTsy::CompleteReadViagHomeZoneParamsResp - iSmsC: %S", &iViagParams->iSmsC );
-TFLOGSTRING2("TSY: CMmSIMTsy::CompleteReadViagHomeZoneParamsResp - iScp: %S",  &iViagParams->iScp );
-TFLOGSTRING2("TSY: CMmSIMTsy::CompleteReadViagHomeZoneParamsResp - iSubscribedZoneAndVersion: %d", iViagParams->iSubscribedZoneAndVersion );
+OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSIMTSY_COMPLETEREADVIAGHOMEZONEPARAMSRESP_2, "TSY: CMmSIMTsy::CompleteReadViagHomeZoneParamsResp - iSmsC: %S", iViagParams->iSmsC );
+OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSIMTSY_COMPLETEREADVIAGHOMEZONEPARAMSRESP_3, "TSY: CMmSIMTsy::CompleteReadViagHomeZoneParamsResp - iScp: %S",  iViagParams->iScp );
+OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSIMTSY_COMPLETEREADVIAGHOMEZONEPARAMSRESP_4, "TSY: CMmSIMTsy::CompleteReadViagHomeZoneParamsResp - iSubscribedZoneAndVersion: %d", iViagParams->iSubscribedZoneAndVersion );
 
             for ( TUint8 i = 0; i < RMmCustomAPI::KViagElementCount; i++ )
                 {
                 iViagElems[ i ].iCoordinates.iX = aElems->At(i).iCoordinates.iX;
-TFLOGSTRING3("TSY: CMmSIMTsy::CompleteReadViagHomeZoneParamsResp - Element: %d, iX: %d", i, aElems->At(i).iCoordinates.iX );
+OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSIMTSY_COMPLETEREADVIAGHOMEZONEPARAMSRESP_5, "TSY: CMmSIMTsy::CompleteReadViagHomeZoneParamsResp - Element: %d, iX: %d", i, aElems->At(i).iCoordinates.iX );
 
                 iViagElems[ i ].iCoordinates.iY = aElems->At(i).iCoordinates.iY;
-TFLOGSTRING3("TSY: CMmSIMTsy::CompleteReadViagHomeZoneParamsResp - Element: %d, iY: %d", i, aElems->At(i).iCoordinates.iY );
+OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSIMTSY_COMPLETEREADVIAGHOMEZONEPARAMSRESP_6, "TSY: CMmSIMTsy::CompleteReadViagHomeZoneParamsResp - Element: %d, iY: %d", i, aElems->At(i).iCoordinates.iY );
 
                 iViagElems[ i ].iCoordinates.iR2 = aElems->
                     At(i).iCoordinates.iR2;
-TFLOGSTRING3("TSY: CMmSIMTsy::CompleteReadViagHomeZoneParamsResp - Element: %d, iR2: %d", i, aElems->At(i).iCoordinates.iR2 );
+OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSIMTSY_COMPLETEREADVIAGHOMEZONEPARAMSRESP_7, "TSY: CMmSIMTsy::CompleteReadViagHomeZoneParamsResp - Element: %d, iR2: %d", i, aElems->At(i).iCoordinates.iR2 );
 
                 iViagElems[ i ].iCoordinates.iZoneId = aElems->
                     At(i).iCoordinates.iZoneId;
-TFLOGSTRING3("TSY: CMmSIMTsy::CompleteReadViagHomeZoneParamsResp - Element: %d, iZoneId: %d", i, aElems->At(i).iCoordinates.iZoneId );
+OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSIMTSY_COMPLETEREADVIAGHOMEZONEPARAMSRESP_8, "TSY: CMmSIMTsy::CompleteReadViagHomeZoneParamsResp - Element: %d, iZoneId: %d", i, aElems->At(i).iCoordinates.iZoneId );
 
                 iViagElems[ i ].iName.Copy( aElems->At(i).iName );
                 iViagElems[ i ].iActiveFlag = aElems->At(i).iActiveFlag;
-TFLOGSTRING3("TSY: CMmSIMTsy::CompleteReadViagHomeZoneParamsResp - Element: %d, iActiveFlag: %d", i, aElems->At(i).iActiveFlag );
+OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSIMTSY_COMPLETEREADVIAGHOMEZONEPARAMSRESP_9, "TSY: CMmSIMTsy::CompleteReadViagHomeZoneParamsResp - Element: %d, iActiveFlag: %d", i, aElems->At(i).iActiveFlag );
                 }
             }
         iMmCustomTsy->ReqCompleted( reqHandle, aError );
@@ -499,7 +504,7 @@
 //
 TInt CMmSIMTsy::ReadViagHomeZoneParamsCancel()
     {
-TFLOGSTRING("TSY: CMmSIMTsy::ReadViagHomeZoneParamsCancel");
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSIMTSY_READVIAGHOMEZONEPARAMSCANCEL_1, "TSY: CMmSIMTsy::ReadViagHomeZoneParamsCancel");
     // reset the pointer to client space
     iViagParams = NULL;
     iViagElems = NULL;
@@ -527,7 +532,7 @@
     RMmCustomAPI::TViagCacheRecordId* aViagRecordId,
     RMmCustomAPI::TViagCacheRecordContent* aViagRecordContent )
     {
-TFLOGSTRING("TSY: CMmSIMTsy::ReadViagHomeZoneCacheL");
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSIMTSY_READVIAGHOMEZONECACHEL_1, "TSY: CMmSIMTsy::ReadViagHomeZoneCacheL");
     TInt ret( KErrGeneral );
 
     if ( ESIMTsyReqHandleUnknown != iTsyReqHandleStore->GetTsyReqHandle(
@@ -564,7 +569,7 @@
     RMmCustomAPI::TViagCacheRecordContent* aViagRecord,
     TInt aError )
     {
-TFLOGSTRING("TSY: CMmSIMTsy::CompleteReadViagHomeZoneCacheRespL");
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSIMTSY_COMPLETEREADVIAGHOMEZONECACHERESPL_1, "TSY: CMmSIMTsy::CompleteReadViagHomeZoneCacheRespL");
     iLastViagHomeZoneCacheError = aError;
     if (iCurrentlyRetrievedCache == NULL)
         {
@@ -586,7 +591,7 @@
                 ( ( iCurrentlyRetrievedCache->iCacheId - 1 ) * 21 ) +
                 iCurrentlyRetrievedCache->iRecordId;
             iViagDynamicCache->At( arrayIndex ) = *aViagRecord;
-TFLOGSTRING3("TSY: CMmSIMTsy::CompleteReadViagHomeZoneCacheRespL:Entry at cacheId=%d, recordId=%d read.", iCurrentlyRetrievedCache->iCacheId,iCurrentlyRetrievedCache->iRecordId);
+OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSIMTSY_COMPLETEREADVIAGHOMEZONECACHERESPL_2, "TSY: CMmSIMTsy::CompleteReadViagHomeZoneCacheRespL:Entry at cacheId=%d, recordId=%d read.", iCurrentlyRetrievedCache->iCacheId,iCurrentlyRetrievedCache->iRecordId);
 
             TRAP_IGNORE(
                 // loop. loop four caches times 21 entries!
@@ -618,14 +623,14 @@
                 delete iCurrentlyRetrievedCache;
                 iCurrentlyRetrievedCache = NULL;
                 iViagHomeZoneCacheReady = ETrue;
-TFLOGSTRING("TSY: CMmSIMTsy::CompleteReadViagHomeZoneCacheRespL:Caching completed successfully!");
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSIMTSY_COMPLETEREADVIAGHOMEZONECACHERESPL_3, "TSY: CMmSIMTsy::CompleteReadViagHomeZoneCacheRespL:Caching completed successfully!");
 
                 if( 0 < iReadViagHomeZoneCacheRequests.Count() )
                     {
                     
                     for ( TInt i=0; i <iReadViagHomeZoneCacheRequests.Count() ; i++ )
                         {
-TFLOGSTRING2("TSY: CMmSIMTsy::CompleteReadDynamicViagHomeZoneCacheRespL: for i:%d", i);
+OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSIMTSY_COMPLETEREADVIAGHOMEZONECACHERESPL_4, "TSY: CMmSIMTsy::CompleteReadDynamicViagHomeZoneCacheRespL: for i:%d", i);
                         TReadViagHomeZoneCacheRequest* req = 
 		  			    iReadViagHomeZoneCacheRequests[ i ];
 		  			    
@@ -655,13 +660,13 @@
             // caching aborted
         delete iCurrentlyRetrievedCache;
         iCurrentlyRetrievedCache = NULL;
-TFLOGSTRING2("TSY: CMmSIMTsy::CompleteReadViagHomeZoneCacheRespL:There was a problem reading cache values from SIM, error=%d", aError);
+OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSIMTSY_COMPLETEREADVIAGHOMEZONECACHERESPL_5, "TSY: CMmSIMTsy::CompleteReadViagHomeZoneCacheRespL:There was a problem reading cache values from SIM, error=%d", aError);
             //iViagHomeZoneCacheReady = ETrue;
-TFLOGSTRING("TSY: CMmSIMTsy::CompleteReadViagHomeZoneCacheRespL: Caching completed unsuccessfully!");
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSIMTSY_COMPLETEREADVIAGHOMEZONECACHERESPL_6, "TSY: CMmSIMTsy::CompleteReadViagHomeZoneCacheRespL: Caching completed unsuccessfully!");
 
             for (TInt i = 0; i < iReadViagHomeZoneCacheRequests.Count(); i++)
                 {
-TFLOGSTRING2("TSY: CMmSIMTsy::CompleteReadDynamicViagHomeZoneCacheRespL: for i:%d", i);
+OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSIMTSY_COMPLETEREADVIAGHOMEZONECACHERESPL_7, "TSY: CMmSIMTsy::CompleteReadDynamicViagHomeZoneCacheRespL: for i:%d", i);
                 TReadViagHomeZoneCacheRequest* req =
                         iReadViagHomeZoneCacheRequests[i];
                 iMmCustomTsy->ReqCompleted(req->iReqHandle, aError);
@@ -680,8 +685,8 @@
 TInt CMmSIMTsy::ReadViagHomeZoneCacheCancel(
     const TTsyReqHandle aTsyReqHandle )
     {
-TFLOGSTRING("TSY: CMmSIMTsy::ReadViagHomeZoneCacheCancel");
-TFLOGSTRING2("TSY: CMmSIMTsy::ReadViagHomeZoneCacheCancel - Handle:%d",aTsyReqHandle);
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSIMTSY_READVIAGHOMEZONECACHECANCEL_1, "TSY: CMmSIMTsy::ReadViagHomeZoneCacheCancel");
+OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSIMTSY_READVIAGHOMEZONECACHECANCEL_2, "TSY: CMmSIMTsy::ReadViagHomeZoneCacheCancel - Handle:%d",aTsyReqHandle);
     // Reset the pointer to client space
     iViagReadCacheRecord = NULL;
 
@@ -696,7 +701,7 @@
             ESIMRequestTypeReadCache );
         if ( ESIMTsyReqHandleUnknown != reqHandle )
         	{
-TFLOGSTRING2("TSY: CMmSIMTsy::ReadViagHomeZoneCacheCancel - Completed with Cancel Handle:%d",reqHandle);	
+OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSIMTSY_READVIAGHOMEZONECACHECANCEL_3, "TSY: CMmSIMTsy::ReadViagHomeZoneCacheCancel - Completed with Cancel Handle:%d",reqHandle);
 			// Complete request with cancel
 			iMmCustomTsy->ReqCompleted( reqHandle, KErrCancel );
         	}
@@ -714,7 +719,7 @@
                 if (aTsyReqHandle == req->iReqHandle)
                 	{
                 	// Complete the request if the request handle is found
-TFLOGSTRING3("TSY: CMmSIMTsy::ReadViagHomeZoneCacheCancel - Complete with Cancel from array Handle:%d Id=%d ", req->iReqHandle,i);
+OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSIMTSY_READVIAGHOMEZONECACHECANCEL_4, "TSY: CMmSIMTsy::ReadViagHomeZoneCacheCancel - Complete with Cancel from array Handle:%d Id=%d ", req->iReqHandle,i);
                     iMmCustomTsy->ReqCompleted( req->iReqHandle, KErrCancel );
 	                delete iReadViagHomeZoneCacheRequests[ i ];
 	                iReadViagHomeZoneCacheRequests.Remove(i);
@@ -737,8 +742,8 @@
     RMmCustomAPI::TViagCacheRecordId* aViagRecordId,
     RMmCustomAPI::TViagCacheRecordContent* aViagRecordContent )
     {
-TFLOGSTRING2("TSY: CMmSIMTsy::ReadDynamicViagHomeZoneCache:Is ViagHomeZoneCache Ready =%d", iViagHomeZoneCacheReady);
-TFLOGSTRING3("TSY: CMmSIMTsy::ReadDynamicViagHomeZoneCache iCacheId %d iRecordId %d",aViagRecordId->iCacheId,aViagRecordId->iRecordId );
+OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSIMTSY_READDYNAMICVIAGHOMEZONECACHEL_1, "TSY: CMmSIMTsy::ReadDynamicViagHomeZoneCache:Is ViagHomeZoneCache Ready =%d", iViagHomeZoneCacheReady);
+OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSIMTSY_READDYNAMICVIAGHOMEZONECACHEL_2, "TSY: CMmSIMTsy::ReadDynamicViagHomeZoneCache iCacheId %d iRecordId %d",aViagRecordId->iCacheId,aViagRecordId->iRecordId );
     TInt err = KErrNone;
 	//  KPhEngMaxViagHomeZones(4) * KPhEngMaxCacheId(21)
 	if ( 1 > aViagRecordId->iCacheId || 4 < aViagRecordId->iCacheId || 
@@ -748,7 +753,7 @@
 		}
     else if ( iViagDynamicCache && iViagHomeZoneCacheReady )
         {
-TFLOGSTRING("TSY: CMmSIMTsy::ReadDynamicViagHomeZoneCache: else if : Cache is ready, Reading cache possible");
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSIMTSY_READDYNAMICVIAGHOMEZONECACHEL_3, "TSY: CMmSIMTsy::ReadDynamicViagHomeZoneCache: else if : Cache is ready, Reading cache possible");
         // copy data from dynamic cache to client
         // some arithmetics:
         //     cache ids range 1..4
@@ -761,7 +766,7 @@
         }
     else if ( !iViagHomeZoneCacheReady )
         {
- TFLOGSTRING("TSY: CMmSIMTsy::ReadDynamicViagHomeZoneCache: else if : Cache is NOT ready, Reading cache NOT possible");
+ OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSIMTSY_READDYNAMICVIAGHOMEZONECACHEL_4, "TSY: CMmSIMTsy::ReadDynamicViagHomeZoneCache: else if : Cache is NOT ready, Reading cache NOT possible");
         //The request is already in processing because of previous request
         //Complete request with status value informing the client about
 		TReadViagHomeZoneCacheRequest* req = 
@@ -796,7 +801,7 @@
     RMmCustomAPI::TViagCacheRecordId* aViagRecordId,
     RMmCustomAPI::TViagCacheRecordContent* aViagRecordContent )
     {
-TFLOGSTRING3("TSY: CCMmSIMTsy::WriteViagHomeZoneCacheL iCacheId %d iRecordId %d",aViagRecordId->iCacheId,aViagRecordId->iRecordId );
+OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSIMTSY_WRITEVIAGHOMEZONECACHEL_1, "TSY: CCMmSIMTsy::WriteViagHomeZoneCacheL iCacheId %d iRecordId %d",aViagRecordId->iCacheId,aViagRecordId->iRecordId );
     TInt ret( KErrGeneral );
 
     if ( ESIMTsyReqHandleUnknown != iTsyReqHandleStore->GetTsyReqHandle(
@@ -848,7 +853,7 @@
 void CMmSIMTsy::CompleteWriteViagHomeZoneCacheResp(
     TInt aError )
     {
-TFLOGSTRING("TSY: CMmSIMTsy::CompleteWriteViagHomeZoneCacheResp");
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSIMTSY_COMPLETEWRITEVIAGHOMEZONECACHERESP_1, "TSY: CMmSIMTsy::CompleteWriteViagHomeZoneCacheResp");
     TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle(
         ESIMRequestTypeWriteCache );
 
@@ -869,7 +874,7 @@
 void CMmSIMTsy::CompleteWriteViagHomeZoneUHZIUESettingsResp(
     TInt aError )
     {
-TFLOGSTRING2("TSY: CMmSIMTsy::CompleteWriteViagHomeZoneUHZIUESettingsResp error = %d",aError);
+OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSIMTSY_COMPLETEWRITEVIAGHOMEZONEUHZIUESETTINGSRESP_1, "TSY: CMmSIMTsy::CompleteWriteViagHomeZoneUHZIUESettingsResp error = %d",aError);
     TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle(
         ESIMRequestTypeWriteSettings );
 
@@ -908,12 +913,12 @@
 //
 void CMmSIMTsy::StartDynamicCachingL()
     {
-TFLOGSTRING("TSY: CMmSIMTsy::StartDynamicCachingL");
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSIMTSY_STARTDYNAMICCACHINGL_1, "TSY: CMmSIMTsy::StartDynamicCachingL");
     iLastViagHomeZoneCacheError = KErrNone;
 	// Make sure there are no ongoing dynamic caching requests.. 
 	if( iCurrentlyRetrievedCache ) 
 		{ 
-TFLOGSTRING("TSY: CMmSIMTsy::StartDynamicCachingL - iCurrentlyRetrievedCache already exists - no new request done");       
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSIMTSY_STARTDYNAMICCACHINGL_2, "TSY: CMmSIMTsy::StartDynamicCachingL - iCurrentlyRetrievedCache already exists - no new request done");
 		return; 
 		} 
 
@@ -922,10 +927,10 @@
         RMmCustomAPI::TViagCacheRecordId(); );
     if ( trapError )
         {
-TFLOGSTRING2("TSY: CMmSIMTsy::StartDynamicCachingL:Could not start caching, error=%d", trapError);
+OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSIMTSY_STARTDYNAMICCACHINGL_3, "TSY: CMmSIMTsy::StartDynamicCachingL:Could not start caching, error=%d", trapError);
         return;
     }
-TFLOGSTRING("TSY: CMmSIMTsy::StartDynamicCachingL:Starting caching now.");
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSIMTSY_STARTDYNAMICCACHINGL_4, "TSY: CMmSIMTsy::StartDynamicCachingL:Starting caching now.");
     iCurrentlyRetrievedCache->iCacheId = 1;  // caches range from 1 to 4
     iCurrentlyRetrievedCache->iRecordId = 0; // records range from 0 to 20
     // send request to DOS
@@ -946,7 +951,7 @@
 TInt CMmSIMTsy::WriteViagHomeZoneUHZIUESettingsL(
     RMmCustomAPI::TViagUHZIUESettings* aSettings )
     {
-TFLOGSTRING("TSY: CMmSIMTsy::WriteViagHomeZoneUHZIUESettingsL");
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSIMTSY_WRITEVIAGHOMEZONEUHZIUESETTINGSL_1, "TSY: CMmSIMTsy::WriteViagHomeZoneUHZIUESettingsL");
     TInt ret( KErrGeneral );
 
     if ( ESIMTsyReqHandleUnknown != iTsyReqHandleStore->GetTsyReqHandle(
@@ -977,7 +982,7 @@
 //
 TInt CMmSIMTsy::WriteViagHomeZoneUHZIUESettingsCancel()
     {
-TFLOGSTRING("TSY: CMmSIMTsy::WriteViagHomeZoneUHZIUESettingsCancel");
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSIMTSY_WRITEVIAGHOMEZONEUHZIUESETTINGSCANCEL_1, "TSY: CMmSIMTsy::WriteViagHomeZoneUHZIUESettingsCancel");
     // check if handle is not in use.
     TTsyReqHandle scFileHandle = 
         iTsyReqHandleStore->GetTsyReqHandle( ESIMRequestTypeWriteSettings );
@@ -1009,7 +1014,7 @@
 TInt CMmSIMTsy::StartSimCbTopicBrowsingL(
     const TTsyReqHandle /*aTsyReqHandle */)
     {
-TFLOGSTRING("TSY: CMmSIMTsy::StartSimCbTopicBrowsingL");
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSIMTSY_STARTSIMCBTOPICBROWSINGL_1, "TSY: CMmSIMTsy::StartSimCbTopicBrowsingL");
     // reset variables
     ResetAndDestroySimCbTopics();
     iGetNextSimCbTopicIndex = KNoCbIds;
@@ -1050,7 +1055,7 @@
     CArrayFixFlat<RMmCustomAPI::TSimCbTopic>* aTopics, 
     TInt aError )
     {
-TFLOGSTRING("TSY: CMmSIMTsy::CompleteStartSimCbTopicBrowsing");
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSIMTSY_COMPLETESTARTSIMCBTOPICBROWSING_1, "TSY: CMmSIMTsy::CompleteStartSimCbTopicBrowsing");
     TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle(
         ESIMRequestTypeStartSimCbTopicBrowsing );
 
@@ -1093,7 +1098,7 @@
     TTsyReqHandle aTsyReqHandle, 
     RMmCustomAPI::TSimCbTopic *aSimCbTopic )
     {
-TFLOGSTRING("TSY: CMmSIMTsy::GetNextSimCbTopic");
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSIMTSY_GETNEXTSIMCBTOPIC_1, "TSY: CMmSIMTsy::GetNextSimCbTopic");
     // initialize ret with KErrNotFound
     TInt ret ( KErrNotFound );
 
@@ -1129,7 +1134,7 @@
     const TTsyReqHandle /*aTsyReqHandle */, 
     TUint* aSimCbTopicNumber )
     {
-TFLOGSTRING("TSY: CMmSIMTsy::DeleteSimCbTopicL");
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSIMTSY_DELETESIMCBTOPICL_1, "TSY: CMmSIMTsy::DeleteSimCbTopicL");
     TInt ret( KErrNone );
     TBool topicInSimMemoryDelete ( EFalse );
 
@@ -1188,7 +1193,7 @@
 void CMmSIMTsy::CompleteDeleteSimCbTopic(
     TInt aError )
     {
-TFLOGSTRING2("TSY: CMmSIMTsy::CompleteDeleteSimCbTopic- aError: %d", aError);
+OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSIMTSY_COMPLETEDELETESIMCBTOPIC_1, "TSY: CMmSIMTsy::CompleteDeleteSimCbTopic- aError: %d", aError);
     TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle(
         ESIMRequestTypeDeleteSimCbTopic );
 
@@ -1298,7 +1303,7 @@
     TInt aReqHandleType, 
     TInt aError )
     {
-TFLOGSTRING3( "CustomTSY: CMmSIMTsy::Complete.\n\t ReqHandleType:%d \n\t Error:%d\n", aReqHandleType, aError );
+OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMSIMTSY_COMPLETE_1,  "CustomTSY: CMmSIMTsy::Complete.\n\t ReqHandleType:%d \n\t Error:%d\n", aReqHandleType, aError );
 
     // All possible TSY req handle types are listed in the
     // switch case below.
MCL/sf/os/cellularsrv