FCL/sf/os/cellularsrv: comparison telephonyserverplugins/common_tsy/commontsy/src/mmstorage/cmmphonebookstoretsy.cpp

equal deleted inserted replaced

-:630d2f34d719
+:07a122eea281
-// Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
 // under the terms of "Eclipse Public License v1.0"
 // which accompanies this distribution, and is available
 // at the URL "http://www.eclipse.org/legal/epl-v10.html".
 //
 //  INCLUDE FILES
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "cmmphonebookstoretsyTraces.h"
-#endif
 #include "cmmphonebookstoretsy.h"
 #include "cmmpblist.h"
 #include "cmmphonebookstoregsmext.h"
 #include "CMmCustomTsy.h"
+#include <ctsy/tflogger.h>
 #include <ctsy/rmmcustomapi.h>
 #include "cmmmessagemanagerbase.h"
 #include "cmmtsyreqhandlestore.h"
 #include <ctsy/pluginapi/cmmdatapackage.h>
 #include <ctsy/serviceapi/mmtsy_ipcdefs.h>
 {
 }
 void CMmPhoneBookStoreTsy::ConstructL( const TDesC& aName )
 {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_CONSTRUCTL_1, "TSY: CMmPhoneBookStoreTsy::ConstructL - entered");
+TFLOGSTRING("TSY: CMmPhoneBookStoreTsy::ConstructL - entered");
 #ifdef REQHANDLE_TIMER
 // Create req handle store
 iTsyReqHandleStore = CMmTsyReqHandleStore::NewL( this,
 iMmPhoneTsy,
 EMmTsyNumOfStorageRequests,
 // Set extension mode
 SetActivePBExtension( iMmPhoneBookStoreExtInterface );
 // Set phonebookrelated name and number max values
 SetMaxNameAndNumLenght();
-OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_CONSTRUCTL_2, "TSY: CMmPhoneBookStoreTsy::ConstructL - PB %S", iPhoneBookName);
+TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::ConstructL - PB %S", &iPhoneBookName);
 // Used entries is zero in the start
 iUsedEntries = 0;
 // Create bootState
 iRetFillBufferedDes = KErrNone;
 iReadReqStore->iCaching = EFalse;
 iRequestedOnPBRead = EFalse;
 iIsPBInitCompleted = EFalse;
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_CONSTRUCTL_3, "TSY: CMmPhoneBookStoreTsy::ConstructL - iIsPhonebookInitialized: %u", (TUint)iStoreInfoData->iIsPhonebookInitialized);
+TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::ConstructL - iIsPhonebookInitialized: %i", iStoreInfoData->iIsPhonebookInitialized);
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_CONSTRUCTL_4, "TSY: CMmPhoneBookStoreTsy::ConstructL - iSIMReady: %u", (TUint)bootState->iSIMReady);
+TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::ConstructL - iSIMReady: %i", bootState->iSIMReady);
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_CONSTRUCTL_5, "TSY: CMmPhoneBookStoreTsy::ConstructL - before initialization");
+TFLOGSTRING("TSY: CMmPhoneBookStoreTsy::ConstructL - before initialization");
 if(bootState->iSIMReady)
 {
 SimIsReady();
 }
 else
 CMmPhoneBookStoreTsy* CMmPhoneBookStoreTsy::NewL(
 CMmPhoneTsy* aMmPhone,
 const TDesC& aName )
 {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_NEWL_1, "TSY: CMmPhoneBookStoreTsy::NewL - entered");
+TFLOGSTRING("TSY: CMmPhoneBookStoreTsy::NewL - entered");
 CMmPhoneBookStoreTsy* mmPhoneBookStoreTsy =
 new ( ELeave ) CMmPhoneBookStoreTsy();
 CleanupClosePushL( *mmPhoneBookStoreTsy );
 }
 CMmPhoneBookStoreTsy::~CMmPhoneBookStoreTsy()
 {
-OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_DTOR_1, "TSY: CMmPhoneBookStoreTsy::~CMmPhoneBookStoreTsy - PB %S", iPhoneBookName);
+TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::~CMmPhoneBookStoreTsy - PB %S", &iPhoneBookName);
 if ( iMmPhoneTsy )
 {
 CMmPhoneTsy::TNosBootState* bootState = iMmPhoneTsy->NosBootState();
 if ( iMmPhoneTsy->GetCustomTsy() )
 {
 RMmCustomAPI::TPndCacheStatus fdnCacheStatus =
 iMmPhoneTsy->GetCustomTsy()->GetPhonebookCacheStatus( KFDNPhoneBook );
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_DTOR_2, "TSY: CMmPhoneBookStoreTsy::~CMmPhoneBookStoreTsy - FDN cachestatus %d", fdnCacheStatus);
+TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::~CMmPhoneBookStoreTsy - FDN cachestatus %d", fdnCacheStatus);
 RMmCustomAPI::TPndCacheStatus adnCacheStatus =
 iMmPhoneTsy->GetCustomTsy()->GetPhonebookCacheStatus( KADNPhoneBook );
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_DTOR_3, "TSY: CMmPhoneBookStoreTsy::~CMmPhoneBookStoreTsy - ADN cachestatus %d", adnCacheStatus);
+TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::~CMmPhoneBookStoreTsy - ADN cachestatus %d", adnCacheStatus);
 // Check if the caching is active
 if ( bootState->iCachingActive )
 {
 // Check if the phonebook type is either ADN or FDN
 CPhoneBookDataPackage package;
 // Set package data
 package.SetPhoneBookName( iPhoneBookName );
 TRAP_IGNORE( iMmPhoneTsy->MessageManager()->HandleRequestL(
 EMmTsyPhoneBookStoreCacheCancelIPC, &package ); );
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_DTOR_4, "TSY: CMmPhoneBookStoreTsy::~CMmPhoneBookStoreTsy - CacheCancel for %d", iPhoneBookType);
+TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::~CMmPhoneBookStoreTsy - CacheCancel for %d", iPhoneBookType);
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_DTOR_5, "TSY: CMmPhoneBookStoreTsy::~CMmPhoneBookStoreTsy - CachingActive = EFalse");
+TFLOGSTRING("TSY: CMmPhoneBookStoreTsy::~CMmPhoneBookStoreTsy - CachingActive = EFalse");
 bootState->iCachingActive = EFalse;
 }
 }
 || RMmCustomAPI::ECacheFailed == fdnCacheStatus ) && (KADNPhoneBook == iPhoneBookType) )
 || (( RMmCustomAPI::ECacheNotReady == adnCacheStatus
 || RMmCustomAPI::ECacheFailed == adnCacheStatus )) && (KFDNPhoneBook == iPhoneBookType) )
 {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_DTOR_6, "TSY: CMmPhoneBookStoreTsy::~CMmPhoneBookStoreTsy - CachingActive = ETrue");
+TFLOGSTRING("TSY: CMmPhoneBookStoreTsy::~CMmPhoneBookStoreTsy - CachingActive = ETrue");
 // Set the caching back to active
 bootState->iCachingActive = ETrue;
 }
 }
 }
 // ---------------------------------------------------------------------------
 //
 CTelObject::TReqMode CMmPhoneBookStoreTsy::ReqModeL(
 const TInt aIpc )
 {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_REQMODEL_1, "TSY: CMmPhoneBookStoreTsy::ReqModeL IPC:%d", aIpc);
+TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::ReqModeL IPC:%d", aIpc);
 CTelObject::TReqMode ret = 0;
 switch ( aIpc )
 {
 // Flow Controlled Services
 //
 TInt CMmPhoneBookStoreTsy::CancelService(
 const TInt aIpc,
 const TTsyReqHandle aTsyReqHandle )
 {
-OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_CANCELSERVICE_1, "TSY: CMmPhoneBookStoreTsy::CancelService IPC:%d Handle:%d", aIpc, aTsyReqHandle);
+TFLOGSTRING3("TSY: CMmPhoneBookStoreTsy::CancelService IPC:%d Handle:%d", aIpc, aTsyReqHandle);
 TInt ret( KErrNone );
 switch ( aIpc )
 {
 ret =  NotifyStoreEventCancel( aTsyReqHandle );
 break;
 default:
 break;
 }
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_CANCELSERVICE_2, "TSY: CMmPhoneBookStoreTsy::CancelService return: %d", ret);
+TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::CancelService return: %d", ret);
 return ret;
 }
 // ---------------------------------------------------------------------------
 TInt CMmPhoneBookStoreTsy::ExtFunc(
 const TTsyReqHandle aTsyReqHandle,
 const TInt aIpc,
 const TDataPackage& aPackage )
 {
-OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_EXTFUNC_1, "TSY: CMmPhoneBookStoreTsy::ExtFunc IPC:%d Handle:%d", aIpc, aTsyReqHandle);
+TFLOGSTRING3("TSY: CMmPhoneBookStoreTsy::ExtFunc IPC:%d Handle:%d", aIpc, aTsyReqHandle);
 TInt ret = KErrNone;
 TInt trapError = KErrNone;
 // Ensure the ReqHandleType is unset.
 TInt CMmPhoneBookStoreTsy::DoExtFuncL(
 const TTsyReqHandle aTsyReqHandle,
 const TInt aIpc,
 const TDataPackage& aPackage )
 {
-OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_DOEXTFUNCL_1, "TSY: CMmPhoneBookStoreTsy::DoExtFuncL IPC:%d Handle:%d", aIpc, aTsyReqHandle);
+TFLOGSTRING3("TSY: CMmPhoneBookStoreTsy::DoExtFuncL IPC:%d Handle:%d", aIpc, aTsyReqHandle);
 TAny* dataPtr=aPackage.Ptr1();
 TAny* dataPtr2=aPackage.Ptr2();
 TInt result(KErrNotSupported);
 }
 else if ( !aName.CompareF( KETelIccMbdnPhoneBook ) )
 {
 iPhoneBookType = KMBDNPhoneBook; //MBDN
 }
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_SETPHONEBOOKTYPE_1,  "TSY: CMmPhoneBookStoreTsy::SetPhoneBookType - Type: %d", iPhoneBookType);
+TFLOGSTRING2( "TSY: CMmPhoneBookStoreTsy::SetPhoneBookType - Type: %d", iPhoneBookType);
 }
 // ---------------------------------------------------------------------------
 // CMmPhoneBookStoreTsy::CompletePBStoreInitializationL
 // Completes Phonebook initialization
 //
 void CMmPhoneBookStoreTsy::CompletePBStoreInitializationL(
 TInt aResult,
 CMmDataPackage* aDataPackage )
 {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_COMPLETEPBSTOREINITIALIZATIONL_1, "TSY: CMmPhoneBookStoreTsy::CompletePBStoreInitializationL - Result: %d",aResult );
+TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::CompletePBStoreInitializationL - Result: %i",aResult );
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_COMPLETEPBSTOREINITIALIZATIONL_2, "TSY: CMmPhoneBookStoreTsy::CompletePBStoreInitializationL - PhoneBookType: %u",iPhoneBookType );
+TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::CompletePBStoreInitializationL - PhoneBookType: %u",iPhoneBookType );
 // If initialization made successfully
 // fill phonebook related static data
 if ( KErrNone == aResult )
 {
 }
 else
 //Initialisation has failed
 {
 CMmCustomTsy* mmCustom = iMmPhoneTsy->GetCustomTsy();
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_COMPLETEPBSTOREINITIALIZATIONL_3, "TSY: CMmPhoneBookStoreTsy::CompletePBStoreInitializationL has failed" );
+TFLOGSTRING("TSY: CMmPhoneBookStoreTsy::CompletePBStoreInitializationL has failed" );
 if ( NULL != mmCustom )
 {
 //complete
 mmCustom->CompleteNotifyPhoneBookCacheReady
 // (other items were commented in a header).
 // ---------------------------------------------------------------------------
 //
 void CMmPhoneBookStoreTsy::SetMaxNameAndNumLenght()
 {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_SETMAXNAMEANDNUMLENGHT_1, "TSY: CMmPhoneBookStoreTsy::SetMaxNameAndNumLenght");
+TFLOGSTRING("TSY: CMmPhoneBookStoreTsy::SetMaxNameAndNumLenght");
 switch ( iPhoneBookType )
 {
 case KADNPhoneBook:
 iMaxNumLen = iStoreInfoData->iADNNumberLengthMax;
 iMaxTextLen = iStoreInfoData->iADNTextLengthMax;
 TInt CMmPhoneBookStoreTsy::ReadL(
 const TTsyReqHandle aTsyReqHandle,
 RMobilePhoneBookStore::TPBIndexAndNumEntries* aIndexAndEntries,
 TDes8* aPBData, TBool aContinuedRead )
 {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_READL_1, "TSY: CMmPhoneBookStoreTsy::ReadL");
+TFLOGSTRING("TSY: CMmPhoneBookStoreTsy::ReadL");
 // Initialise ret to KErrServerBusy
 TInt ret = KErrServerBusy;
 // Check if request handle already exists
 // since the handle will already be set. This is done by checking the value of aContinuedRead which
 // is set ETrue when ReadL is invoked from ContinueReadL.
 if ( !aContinuedRead && EMultimodePhoneBookStoreReqHandleUnknown != phoneBookStoreReadHandle )
 {
 // If request handle already exists return KErrServerBusy
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_READL_2, "TSY: CMmPhoneBookStoreTsy::ReadL - Handle already exists");
+TFLOGSTRING("TSY: CMmPhoneBookStoreTsy::ReadL - Handle already exists");
 ReqCompleted( aTsyReqHandle, ret );
 }
 // check the buffer size
 else if ( sizeof(CPhoneBookStoreEntry) > aPBData->MaxLength() )
 {
 //Caching needs to be done only in case of ADN or FDN phonebook.
 else if( !iMmPhoneTsy->GetSimRefreshRegister() &&
 !( iReadReqStore->iCaching ) &&
 (KADNPhoneBook == iPhoneBookType || KFDNPhoneBook == iPhoneBookType))
 {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_READL_3, "TSY: CMmPhoneBookStoreTsy::ReadL - SIM refresh registration failed Cache info can be corrupted - ");
+TFLOGSTRING("TSY: CMmPhoneBookStoreTsy::ReadL - SIM refresh registration failed Cache info can be corrupted - ");
 //Store Read req params for new request
 iReadReqStore->iReqHandle = aTsyReqHandle;
 iReadReqStore->iIndexAndEntries = aIndexAndEntries;
 iReadReqStore->iPBData = aPBData;
 {
 if ( ( KADNPhoneBook == iPhoneBookType ||
 KFDNPhoneBook == iPhoneBookType ) &&
 ( !iStoreInfoData->iIsPhonebookInitialized || !iCacheReady ) )
 {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_READL_4, "TSY: CMmPhoneBookStoreTsy::ReadL - Initiliszation ongoing -> Read not possible");
+TFLOGSTRING("TSY: CMmPhoneBookStoreTsy::ReadL - Initiliszation ongoing -> Read not possible");
 // If phonebook initialisation is not ready for AND and FDN phonebooks,
 // complete with KErrInUse. This is done becauce TSY can not handle
 // multible simultaneously request to certain phonebook.
 // (No dynamic transaktion Ids)
 ret = KErrInUse;
 // If user supplies index which is less than 0, complete with
 // KErrArgument each record are numbered from 0 to maximum
 // number of records.
 if ( ( 1 > iIndexToRead ) || ( 1 > aIndexAndEntries->iNumSlots ) )
 {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_READL_5, "TSY: CMmPhoneBookStoreTsy::ReadL - Index is less than 1 or aIndexAndEntries->iNumSlots is less then 1" );
+TFLOGSTRING("TSY: CMmPhoneBookStoreTsy::ReadL - Index is less than 1 or aIndexAndEntries->iNumSlots is less then 1" );
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_READL_6, "TSY: CMmPhoneBookStoreTsy::ReadL - Index %d ", iIndexToRead);
+TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::ReadL - Index %i ", iIndexToRead);
 iIndexAndEntries = NULL;
 iIndexToRead = 0;
 ReqCompleted( aTsyReqHandle, KErrArgument );
 }
 else if ( KBDNPhoneBook != iPhoneBookType &&
 aIndexAndEntries->iNumSlots > iMultipleReadPosTo  )
 {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_READL_7, "TSY: CMmPhoneBookStoreTsy::ReadL - iPhoneBookType %u: ", iPhoneBookType);
+TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::ReadL - iPhoneBookType %i: ", iPhoneBookType);
-OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_READL_8, "TSY: CMmPhoneBookStoreTsy::ReadL - iNumSlots: %d > iMultipleReadPosTo: %d", aIndexAndEntries->iNumSlots, iMultipleReadPosTo );
+TFLOGSTRING3("TSY: CMmPhoneBookStoreTsy::ReadL - iNumSlots: %i > iMultipleReadPosTo: %i", aIndexAndEntries->iNumSlots, iMultipleReadPosTo );
 iIndexAndEntries = NULL;
 iIndexToRead = 0;
 ReqCompleted( aTsyReqHandle, KErrNotFound );
 }
 else
 aIndexAndEntries);
 }
 // If cache request, but cache is not yet ready
 else if ( ( NULL == iPBStoreCache ) || !iCacheReady )
 {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_READL_9, "TSY: CMmPhoneBookStoreTsy::ReadL - Cache is not yet ready" );
+TFLOGSTRING("TSY: CMmPhoneBookStoreTsy::ReadL - Cache is not yet ready" );
 ret = KErrNotReady;
 }
 // Set cache request for completion handling
 else
 {
 cacheRequest = ETrue;
 if ( ( iNumEntriesToRead ) > iMultipleReadPosTo )
 {
 ret = KErrArgument;
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_READL_10, "TSY: CMmPhoneBookStoreTsy::ReadL - KErrArgument" );
+TFLOGSTRING("TSY: CMmPhoneBookStoreTsy::ReadL - KErrArgument" );
 }
 }
 // Error when doing Read -request or error in parameters
 if ( KErrNone != ret )
 }
 }
 // Handle cached request
 else
 {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_READL_11, "TSY: CMmPhoneBookStoreTsy::ReadL - iIndexToRead %d ", iIndexToRead);
+TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::ReadL - iIndexToRead %i ", iIndexToRead);
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_READL_12, "TSY: CMmPhoneBookStoreTsy::ReadL - iNumSlots %d ", iNumEntriesToRead);
+TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::ReadL - iNumSlots %i ", iNumEntriesToRead);
 ReadEntriesFromArrayL( EPBStoreCacheArray );
 aIndexAndEntries->iNumSlots = iNumEntriesFilled;
 //This condition will arise when client has sent a buffer insufficient to
 //hold even one entry. KErrArgument has to be returned in this case.
 if ( ( iRetFillBufferedDes == KErrOverflow ) && ( iNumEntriesFilled == 0 ) )
 {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_READL_13, "TSY: CMmPhoneBookStoreTsy::ReadL - Insufficient buffer to hold even 1 entry." );
+TFLOGSTRING("TSY: CMmPhoneBookStoreTsy::ReadL - Insufficient buffer to hold even 1 entry." );
 ret = KErrArgument;
 }
 else if ( 0 == iNumEntriesFilled )
 {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_READL_14, "TSY: CMmPhoneBookStoreTsy::ReadL - iNumEntriesFilled is 0 " );
+TFLOGSTRING("TSY: CMmPhoneBookStoreTsy::ReadL - iNumEntriesFilled is 0 " );
 ret = KErrNotFound;
 }
 ReqCompleted( aTsyReqHandle, ret );
 }
 }
 //
 void CMmPhoneBookStoreTsy::CompleteReadL(
 TInt aResult,
 CMmDataPackage* aDataPackage )
 {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_COMPLETEREADL_1, "TSY: CMmPhoneBookStoreTsy::CompleteReadL - aResult: %d",aResult );
+TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::CompleteReadL - aResult: %i",aResult );
 TInt errCode = aResult;
 // Reset req handle. Returns the deleted req handle
 TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle(
 EMultimodePhoneBookStoreRead );
 ReadEntriesFromArrayL( EPBStoreReadEntriesArray );
 //This condition will arise when client has sent a buffer insufficient to
 //hold even one entry. KErrArgument has to be returned in this case.
 if ( ( iRetFillBufferedDes == KErrOverflow ) && ( iNumEntriesFilled == 0 ) )
 {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_COMPLETEREADL_2, "TSY: CMmPhoneBookStoreTsy::CompleteReadL - Insufficient buffer to hold even 1 entry." );
+TFLOGSTRING("TSY: CMmPhoneBookStoreTsy::CompleteReadL - Insufficient buffer to hold even 1 entry." );
 errCode = KErrArgument;
 }
 }
 iIndexAndEntries->iNumSlots = iNumEntriesFilled;
 }
 // (other items were commented in a header).
 // ---------------------------------------------------------------------------
 //
 TInt CMmPhoneBookStoreTsy::CountEntriesL()
 {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_COUNTENTRIESL_1, "TSY: CMmPhoneBookStoreTsy::CountEntriesL called");
+TFLOGSTRING("TSY: CMmPhoneBookStoreTsy::CountEntriesL called");
 // before phonebook requests, phonebook must be initialized
 TInt returnValue( KErrNone );
 returnValue = iMmPhoneBookStoreExtInterface->
 CountPhonebookEntriesL( EMmTsyPhoneBookStoreGetInfoIPC,
 //
 void CMmPhoneBookStoreTsy::CompleteCountEntries(
 TInt aResult,
 CMmDataPackage* aDataPackage )
 {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_COMPLETECOUNTENTRIES_1, "TSY: CMmPhoneBookStoreTsy::CompleteCountEntries - Result: %d", aResult );
+TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::CompleteCountEntries - Result: %i", aResult );
 TInt numOfEntries( 0 );
 //reset request handle. Returns the deleted req handle.
 TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle(
 EMultimodePhoneStoreGetInfo );
 #ifndef USING_CTSY_DISPATCHER
 void CMmPhoneBookStoreTsy::CacheEntriesL()
 {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_CACHEENTRIESL_1, "TSY: CMmPhoneBookStoreTsy::CacheEntriesL - entered");
+TFLOGSTRING("TSY: CMmPhoneBookStoreTsy::CacheEntriesL - entered");
 // Get Phonebook related DLL -static data
 // Check if phonebook has been initialized successfully. Caching of ADN
 // entries does not work if phonebook initialize have been failed.
 if ( iStoreInfoData->iIsPhonebookInitialized &&
 ( EFalse == iStoreInfoData->iIsPhonebookInitializeFailed ||
 KADNPhoneBook != iPhoneBookType ) )
 {
-OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_CACHEENTRIESL_2, "TSY: CMmPhoneBookStoreTsy::CacheEntriesL - Cache PB %S ", iPhoneBookName);
+TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::CacheEntriesL - Cache PB %S ", &iPhoneBookName);
 		TInt ret = KErrNone;
 		CMmPhoneTsy::TNosBootState* bootState = iMmPhoneTsy->NosBootState();
 if ( !iCacheReady )
 if ( NULL != iPBStoreCache )
 {
 iPBStoreCache->ResetAndDestroy();
 delete iPBStoreCache;
 iPBStoreCache = NULL;
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_CACHEENTRIESL_3, "TSY: CMmPhoneBookStoreTsy::CacheEntriesL - Old cache deleted");
+TFLOGSTRING("TSY: CMmPhoneBookStoreTsy::CacheEntriesL - Old cache deleted");
 }
 //Inform phonebook that the cache is not ready for refresh
 ResetCacheReady();
 TRAP( ret, ReadToCacheL();)
 }
 }
 else if ( iCacheReady )
 {
-OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_CACHEENTRIESL_4, "TSY: CMmPhoneBookStoreTsy::CacheEntriesL - PB %S cache entries ready", iPhoneBookName);
+TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::CacheEntriesL - PB %S cache entries ready", &iPhoneBookName);
 }
 if ( KErrNone != ret)
 {
-OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_CACHEENTRIESL_5, "TSY: CMmPhoneBookStoreTsy::CacheEntriesL - PB %S caching failed!", iPhoneBookName);
+TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::CacheEntriesL - PB %S caching failed!", &iPhoneBookName);
 }
 }
 // Phonebook not initialized -> let's do it before caching
 else if ( ( !iStoreInfoData->iIsPhonebookInitialized
 || iStoreInfoData->iIsPhonebookInitializeFailed )
 && !iMmPhoneTsy->IsPBInitActive() )
 {
-OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_CACHEENTRIESL_6, "TSY: CMmPhoneBookStoreTsy::CacheEntriesL - Starting initialization PB: %S", iPhoneBookName);
+TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::CacheEntriesL - Starting initialization PB: %S", &iPhoneBookName);
 // before phonebook requests, phonebook must be initialized
 iMmPhoneBookStoreExtInterface->InitPhonebook(
 EMmTsyPhoneBookStoreInitIPC, iPhoneBookName );
 iMmPhoneTsy->SetPBInitActiveStatus( ETrue );
 }
 // ---------------------------------------------------------------------------
 //
 void CMmPhoneBookStoreTsy::CompleteCachingL(
 TInt aResult, CMmDataPackage* aDataPackage )
 {
-OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_COMPLETECACHINGL_1, "TSY: CMmPhoneBookStoreTsy::CompleteCachingL - PB %S Caching completed", iPhoneBookName);
+TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::CompleteCachingL - PB %S Caching completed", &iPhoneBookName);
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_COMPLETECACHINGL_2, "TSY: CMmPhoneBookStoreTsy::CompleteCachingL - Result: %d",aResult );
+TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::CompleteCachingL - Result: %i",aResult );
 #ifdef USING_CTSY_DISPATCHER
 	aDataPackage->UnPackData(iPBStoreCache);
 #else
 	CArrayPtrSeg<CPhoneBookStoreEntry>* entryData;
 // If cache were successfully generated, update
 // the number of used entries
 if ( KErrNone == aResult )
 {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_COMPLETECACHINGL_3, "TSY: CMmPhoneBookStoreTsy::CompleteCachingL - iPBStoreCache->Count: %d",iPBStoreCache->Count() );
+TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::CompleteCachingL - iPBStoreCache->Count: %i",iPBStoreCache->Count() );
 iUsedEntries = iPBStoreCache->Count();
 //Set the caching ready only if request is successfull.
 //when FDN is on, the ADN caching is not successful. Meanwhile the FDN
 //is on, the ADN list is not available, so this is not a problem.
 //When the user turns the FDN back to off the tsy will
 //cache the FDN list
 //again
 iCacheReady = ETrue;
 }
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_COMPLETECACHINGL_4, "TSY: CMmPhoneBookStoreTsy::CompleteCachingL - iUsedEntries: %d",iUsedEntries );
+TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::CompleteCachingL - iUsedEntries: %i",iUsedEntries );
 bootState->iCachingActive = EFalse;
 CMmCustomTsy* mmCustom = iMmPhoneTsy->GetCustomTsy();
 // Check if client has requested caching before completing
 if ( NULL != mmCustom && !iMmPhoneTsy->IsRefreshOngoing() )
 {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_COMPLETECACHINGL_5, "TSY: CMmPhoneBookStoreTsy::CompleteCachingL - Client refresh req complete" );
+TFLOGSTRING("TSY: CMmPhoneBookStoreTsy::CompleteCachingL - Client refresh req complete" );
 if ( KErrNone == aResult )
 {
 mmCustom->UpdateCacheStatus( RMmCustomAPI::ECacheReady,
 iPhoneBookName );
 }
 // Otherwise caching has been originated from SIM and completion goes
 // through refresh
 else
 {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_COMPLETECACHINGL_6, "TSY: CMmPhoneBookStoreTsy::CompleteCachingL - SIM refresh req complete" );
+TFLOGSTRING("TSY: CMmPhoneBookStoreTsy::CompleteCachingL - SIM refresh req complete" );
 // Check for which phonebook the caching must be completed
 if ( !iPhoneBookName.CompareF( KETelIccAdnPhoneBook ) )
 {
 iMmPhoneTsy->CompleteCacheSimL( KCacheAdn, aResult );
 iMmPhoneTsy->CompleteCacheSimL( KCacheFdn, aResult );
 }
 //NOTIFY THE PHONEBOOK that the cache is ready
 if ( NULL != mmCustom )
 {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_COMPLETECACHINGL_7, "TSY: CMmPhoneBookStoreTsy::CompleteCachingL, mmCustom->UpdateCacheStatus" );
+TFLOGSTRING("TSY: CMmPhoneBookStoreTsy::CompleteCachingL, mmCustom->UpdateCacheStatus" );
 if ( KErrNone == aResult )
 {
 mmCustom->UpdateCacheStatus(
 RMmCustomAPI::ECacheReady, iPhoneBookName );
 }
 {
 RMmCustomAPI::TPndCacheStatus fdnCacheStatus =
 mmCustom->GetPhonebookCacheStatus( KFDNPhoneBook );
 RMmCustomAPI::TPndCacheStatus adnCacheStatus =
 mmCustom->GetPhonebookCacheStatus( KADNPhoneBook );
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_COMPLETECACHINGL_8, "TSY: CMmPhoneBookStoreTsy::CompleteCachingL - FDN cachestatus %d", fdnCacheStatus);
+TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::CompleteCachingL - FDN cachestatus %d", fdnCacheStatus);
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_COMPLETECACHINGL_9, "TSY: CMmPhoneBookStoreTsy::CompleteCachingL - ADN cachestatus %d", adnCacheStatus);
+TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::CompleteCachingL - ADN cachestatus %d", adnCacheStatus);
 	    // Set caching back to active if either FDN or ADN is caching
 if ( RMmCustomAPI::ECacheNotReady == fdnCacheStatus
 		|| RMmCustomAPI::ECacheNotReady == adnCacheStatus )
 	    {
 {
 CArrayPtrSeg<CPhoneBookStoreEntry>* ptrToArray = NULL;
 if ( EPBStoreCacheArray == aArrayType )
 {
-OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_READENTRIESFROMARRAYL_1, "TSY: CMmPhoneBookStoreTsy::ReadEntriesFromCache %S, iPBStoreCache", iPhoneBookName);
+TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::ReadEntriesFromCache %S, iPBStoreCache", &iPhoneBookName);
 ptrToArray = iPBStoreCache;
 }
 else if ( EPBStoreReadEntriesArray == aArrayType )
 {
-OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_READENTRIESFROMARRAYL_2, "TSY: CMmPhoneBookStoreTsy::ReadEntriesFromEntryArray %S, iPBStoreReadEntries", iPhoneBookName);
+TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::ReadEntriesFromEntryArray %S, iPBStoreReadEntries", &iPhoneBookName);
 ptrToArray = iPBStoreReadEntries;
 }
 else
 {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_READENTRIESFROMARRAYL_3, "TSY: CMmPhoneBookStoreTsy::ReadEntriesFromEntryArray invalid aArrayType");
+TFLOGSTRING("TSY: CMmPhoneBookStoreTsy::ReadEntriesFromEntryArray invalid aArrayType");
 User::Leave(KErrNotSupported);
 }
 CPhoneBookStoreEntry* cacheEntry = NULL;
 // (other items were commented in a header).
 // ---------------------------------------------------------------------------
 //
 void CMmPhoneBookStoreTsy::ReadToCacheL()
 {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_READTOCACHEL_1, "TSY: CMmPhoneBookStoreTsy::ReadToCacheL");
+TFLOGSTRING("TSY: CMmPhoneBookStoreTsy::ReadToCacheL");
 // Call ReadL from GSM extension
 iMmPhoneBookStoreExtInterface->ReadToCacheL(
 EMmTsyPhoneBookStoreCacheIPC,
 iPhoneBookName);
 //
 void CMmPhoneBookStoreTsy::UpdateCacheL(
 CPhoneBookStoreEntry* aEntry,
 TBool aDeleteEntry )
 {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_UPDATECACHEL_1, "TSY: CMmPhoneBookStoreTsy::UpdateCacheL");
+TFLOGSTRING("TSY: CMmPhoneBookStoreTsy::UpdateCacheL");
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_UPDATECACHEL_2, "TSY: CMmPhoneBookStoreTsy::UpdateCacheL - iPBStoreCache->Count(): %d ", iPBStoreCache->Count() );
+TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::UpdateCacheL - iPBStoreCache->Count(): %i ", iPBStoreCache->Count() );
 if(aEntry == NULL)
 {
 if(aDeleteEntry == EFalse)
 		   {
 		   }
 		User::Leave(KErrArgument);
 }
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_UPDATECACHEL_3, "TSY: CMmPhoneBookStoreTsy::UpdateCacheL - aEntry->Location(): %u ", aEntry->iLocation );
+TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::UpdateCacheL - aEntry->Location(): %i ", aEntry->iLocation );
 TInt result( KErrNotFound );
 TInt updateIndex( 0 );
 for ( TInt index = 0; index < iPBStoreCache->Count() &&
 result == KErrNotFound; index++ )
 {
 if ( ( iPBStoreCache->At( index ) )->iLocation == aEntry->iLocation )
 {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_UPDATECACHEL_4, "TSY: CMmPhoneBookStoreTsy::UpdateCacheL - iPBStoreCache->iLocation:  %u ", aEntry->iLocation);
+TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::UpdateCacheL - iPBStoreCache->iLocation:  %i ", aEntry->iLocation);
 updateIndex =  index;
 result = KErrNone;
 }
 }
 // Reset pointer to PB object. It is stored in iPBStoreCache array
 iWriteEntry = NULL;
 }
 else
 {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_UPDATECACHEL_5, "TSY: CMmPhoneBookStoreTsy::UpdateCacheL, Deleted entry is not in cache! ");
+TFLOGSTRING("TSY: CMmPhoneBookStoreTsy::UpdateCacheL, Deleted entry is not in cache! ");
 }
 }
 // Entry found
 else
 {
 if ( aEntry->iText || aEntry->iNumber ||
 ( aEntry->iAnr && aEntry->iAnr->MdcaCount() > 0 ) ||
 ( aEntry->iEmail && aEntry->iEmail->MdcaCount() > 0 ) ||
 ( aEntry->iSne && aEntry->iSne->MdcaCount() > 0 ) )
 {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_UPDATECACHEL_6, "TSY: CMmPhoneBookStoreTsy::UpdateCacheL - Change existing entry");
+TFLOGSTRING("TSY: CMmPhoneBookStoreTsy::UpdateCacheL - Change existing entry");
 // Every update/deletion of an existing phonebook entry or the
 // addition of a new phone book entry, incremements the
 // iChangeCounter.
 iPhoneBookInfo.iChangeCounter++;
 // Append updated entry to cache
 // Delete current entry
 CPhoneBookStoreEntry* entryToDelete =
 iPBStoreCache->At( updateIndex );
 if ( entryToDelete == iDeleteEntry )
 {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_UPDATECACHEL_7, "TSY: CMmPhoneBookStoreTsy::UpdateCacheL - entryToDelete == iDeleteEntry");
+TFLOGSTRING("TSY: CMmPhoneBookStoreTsy::UpdateCacheL - entryToDelete == iDeleteEntry");
 // reset iDeleteEntry member
 iDeleteEntry = NULL;
 }
 if ( entryToDelete == iWriteEntry )
 {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_UPDATECACHEL_8, "TSY: CMmPhoneBookStoreTsy::UpdateCacheL - entryToDelete == iWriteEntry");
+TFLOGSTRING("TSY: CMmPhoneBookStoreTsy::UpdateCacheL - entryToDelete == iWriteEntry");
 // reset iWriteEntry member
 iWriteEntry = NULL;
 }
 delete entryToDelete;
 entryToDelete = NULL;
 iPBStoreCache->Delete( updateIndex );
 iPBStoreCache->InsertL( updateIndex, aEntry );
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_UPDATECACHEL_9, "TSY: CMmPhoneBookStoreTsy::UpdateCacheL - updateIndex: %d", updateIndex);
+TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::UpdateCacheL - updateIndex: %i", updateIndex);
 if ( aEntry == iWriteEntry )
 {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_UPDATECACHEL_10, "TSY: CMmPhoneBookStoreTsy::UpdateCacheL - aEntry == iWriteEntry");
+TFLOGSTRING("TSY: CMmPhoneBookStoreTsy::UpdateCacheL - aEntry == iWriteEntry");
 // reset iWriteEntry member
 iWriteEntry = NULL;
 }
 // Compress cache
 iPBStoreCache->Compress();
 RMobilePhoneStore::KStoreEntryChanged );
 }
 // Case: <Delete entry from cache>
 else
 {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_UPDATECACHEL_11, "TSY: CMmPhoneBookStoreTsy::UpdateCacheL - Delete entry");
+TFLOGSTRING("TSY: CMmPhoneBookStoreTsy::UpdateCacheL - Delete entry");
 // decrease iUsedEntries
 iUsedEntries--;
 // Every update/deletion of an existing phonebook entry or the
 // addition of a new phone book entry incremements the
 iPhoneBookInfo.iChangeCounter++;
 CPhoneBookStoreEntry* entryToDelete =
 iPBStoreCache->At( updateIndex );
 if ( entryToDelete == iDeleteEntry )
 {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_UPDATECACHEL_12, "TSY: CMmPhoneBookStoreTsy::UpdateCacheL - entryToDelete == iDeleteEntry");
+TFLOGSTRING("TSY: CMmPhoneBookStoreTsy::UpdateCacheL - entryToDelete == iDeleteEntry");
 // reset iDeleteEntry member
 iDeleteEntry = NULL;
 }
 else
 {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_UPDATECACHEL_13, "TSY: CMmPhoneBookStoreTsy::UpdateCacheL - iWriteEntry = NULL");
+TFLOGSTRING("TSY: CMmPhoneBookStoreTsy::UpdateCacheL - iWriteEntry = NULL");
 // reset iWriteEntry member
 iWriteEntry = NULL;
 }
 delete entryToDelete;
 {
 // Append new entry
 if ( 0 == marked )
 {
 ret = pbBuffer->AddNewEntryTag();
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_FILLBUFFEREDDESL_1, "TSY: CMmPhoneBookStoreTsy::FillBufferedDesL - 0, ret: %d ", ret);
+TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::FillBufferedDesL - 0, ret: %i ", ret);
 }
 // Append Index
 else if ( 1 == marked )
 {
 ret = pbBuffer->PutTagAndValue(
 RMobilePhoneBookStore::ETagPBAdnIndex, (TUint16)(
 aPhoneBookStoreResp->iLocation ) );
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_FILLBUFFEREDDESL_2, "TSY: CMmPhoneBookStoreTsy::FillBufferedDesL - 1, ret: %d ", ret);
+TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::FillBufferedDesL - 1, ret: %i ", ret);
 }
 // Append Name
 else if ( 2 == marked )
 {
 if ( aPhoneBookStoreResp->iText &&
 {
 ret = pbBuffer->PutTagAndValue(
 RMobilePhoneBookStore::ETagPBText,
 aPhoneBookStoreResp->iText->Des() );
 }
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_FILLBUFFEREDDESL_3, "TSY: CMmPhoneBookStoreTsy::FillBufferedDesL - 2, ret: %d ", ret);
+TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::FillBufferedDesL - 2, ret: %i ", ret);
 }
 // Append Number
 else if ( 3 == marked )
 {
 if ( aPhoneBookStoreResp->iNumber &&
 {
 ret = pbBuffer->PutTagAndValue(
 RMobilePhoneBookStore::ETagPBNumber,
 aPhoneBookStoreResp->iNumber->Des() );
 }
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_FILLBUFFEREDDESL_4, "TSY: CMmPhoneBookStoreTsy::FillBufferedDesL - 3, ret: %d ", ret);
+TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::FillBufferedDesL - 3, ret: %i ", ret);
 }
 // Append Email
 else if ( 4 == marked )
 {
 for ( TInt numEmails = 0;
 {
 ret = pbBuffer->PutTagAndValue(
 RMobilePhoneBookStore::ETagPBEmailAddress,
 aPhoneBookStoreResp->iEmail->MdcaPoint( numEmails ) );
 }
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_FILLBUFFEREDDESL_5, "TSY: CMmPhoneBookStoreTsy::FillBufferedDesL - 4, ret: %d ", ret);
+TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::FillBufferedDesL - 4, ret: %i ", ret);
 }
 // Append Sne
 else if ( 5 == marked )
 {
 for ( TInt numSnes = 0;
 {
 ret = pbBuffer->PutTagAndValue(
 RMobilePhoneBookStore::ETagPBSecondName,
 aPhoneBookStoreResp->iSne->MdcaPoint( numSnes ) );
 }
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_FILLBUFFEREDDESL_6, "TSY: CMmPhoneBookStoreTsy::FillBufferedDesL - 5, ret: %d ", ret);
+TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::FillBufferedDesL - 5, ret: %i ", ret);
 }
 // Append Anr
 else if ( 6 == marked )
 {
 for ( TInt numAnrs = 0;
 pbBuffer->AddNewNumberTag();
 ret = pbBuffer->PutTagAndValue(
 RMobilePhoneBookStore::ETagPBNumber,
 aPhoneBookStoreResp->iAnr->MdcaPoint( numAnrs ) );
 }
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_FILLBUFFEREDDESL_7, "TSY: CMmPhoneBookStoreTsy::FillBufferedDesL - 6, ret: %d ", ret);
+TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::FillBufferedDesL - 6, ret: %i ", ret);
 }
 marked++;
 }
 iNumEntriesFilled++;
 }
 CleanupStack::PopAndDestroy(pbBuffer);
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_FILLBUFFEREDDESL_8, "TSY: CMmPhoneBookStoreTsy::FillBufferedDesL - returnvalue: %d ", ret);
+TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::FillBufferedDesL - returnvalue: %i ", ret);
 //If simrefresh registration is failed prevent new cache
 if( KErrOverflow == ret && !( iMmPhoneTsy->GetSimRefreshRegister() ) )
 {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_FILLBUFFEREDDESL_9, "TSY: CMmPhoneBookStoreTsy::ReadL - Prevent new cache" );
+TFLOGSTRING("TSY: CMmPhoneBookStoreTsy::ReadL - Prevent new cache" );
 iReadReqStore->iCaching = ETrue;
 }
 iRetFillBufferedDes = ret;
 // ---------------------------------------------------------------------------
 //
 TInt CMmPhoneBookStoreTsy::ReadCancel(
 const TTsyReqHandle aTsyReqHandle )
 {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_READCANCEL_1, "TSY: CMmPhoneBookStoreTsy::ReadCancel - Handle:%d", aTsyReqHandle );
+TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::ReadCancel - Handle:%d", aTsyReqHandle );
 // Reset req handle. Returns the deleted req handle
 TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle(
 EMultimodePhoneBookStoreRead );
 TInt CMmPhoneBookStoreTsy::WriteL(
 const TTsyReqHandle aTsyReqHandle,
 TDesC8* aPBData,
 TInt* aIndex )
 {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_WRITEL_1, "TSY: CMmPhoneBookStoreTsy::WriteL - EtelIndex: %d",*aIndex );
+TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::WriteL - EtelIndex: %i",*aIndex );
 //SDN phonebook can't be updated by user.
 if (iPhoneBookType == KSDNPhoneBook)
 {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_WRITEL_2, "TSY: CMmPhoneBookStoreTsy::WriteL - SDN phonebook entry can't be updated");
+TFLOGSTRING("TSY: CMmPhoneBookStoreTsy::WriteL - SDN phonebook entry can't be updated");
 ReqCompleted( aTsyReqHandle, KErrAccessDenied );
 }
 else
 {
 // Check if request handle already exists
 else
 {
 // Straight write-forwarding to SIM server,
 TInt index = *aIndex;
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_WRITEL_3, "TSY: CMmPhoneBookStoreTsy::WriteL - Straight write-forwarding to SIM");
+TFLOGSTRING("TSY: CMmPhoneBookStoreTsy::WriteL - Straight write-forwarding to SIM");
 ret = WriteByIndexL( index );
 }
 // Check error while processing write
 if ( KErrNone != ret )
 //
 void CMmPhoneBookStoreTsy::CompleteWriteL(
 TInt aResult,
 CMmDataPackage* aDataPackage )
 {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_COMPLETEWRITEL_1, "TSY: CMmPhoneBookStoreTsy::CompleteWriteL - Result: %d",aResult );
+TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::CompleteWriteL - Result: %i",aResult );
 // Reset req handle. Returns the deleted req handle
 TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle(
 EMultimodePhoneBookStoreWrite );
 if ( EMultimodePhoneBookStoreReqHandleUnknown != reqHandle )
 if ( KADNPhoneBook == iPhoneBookType )
 {
 //Update Adn Max Num Length
 iStoreInfoData->iADNNumberLengthMax =
 pbEntryInfo.iMaxNumLength;
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_COMPLETEWRITEL_2, "TSY: CMmPhoneBookStoreTsy::CompleteWriteL: pbEntryInfo.iMaxNumLength:%d", pbEntryInfo.iMaxNumLength);
+TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::CompleteWriteL: pbEntryInfo.iMaxNumLength:%d", pbEntryInfo.iMaxNumLength);
 }
 else if ( KFDNPhoneBook == iPhoneBookType )
 {
 //Update Fdn Max Num Length
 iStoreInfoData->iFDNNumberLengthMax =
 pbEntryInfo.iMaxNumLength;
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_COMPLETEWRITEL_3, "TSY: CMmPhoneBookStoreTsy::CompleteWriteL:FDN pbEntryInfo.iMaxNumLength:%d", pbEntryInfo.iMaxNumLength);
+TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::CompleteWriteL:FDN pbEntryInfo.iMaxNumLength:%d", pbEntryInfo.iMaxNumLength);
 }
 else if ( KVMBXPhoneBook == iPhoneBookType )
 {
 //Update VMBX Max Num Length
 if ( 0 < pbEntryInfo.iMaxNumLength )
 {
 iStoreInfoData->iVMBXNumberLengthMax =
 pbEntryInfo.iMaxNumLength;
 }
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_COMPLETEWRITEL_4, "TSY: CMmPhoneBookStoreTsy::CompleteWriteL:VMBX pbEntryInfo.iMaxNumLength:%d", pbEntryInfo.iMaxNumLength);
+TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::CompleteWriteL:VMBX pbEntryInfo.iMaxNumLength:%d", pbEntryInfo.iMaxNumLength);
 }
 else if ( KMBDNPhoneBook == iPhoneBookType )
 {
 //Update MBDN Max Num Length
 if ( 0 < pbEntryInfo.iMaxNumLength )
 {
 iStoreInfoData->iMBDNNumberLengthMax =
 pbEntryInfo.iMaxNumLength;
 }
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_COMPLETEWRITEL_5, "TSY: CMmPhoneBookStoreTsy::CompleteWriteL:MBDN pbEntryInfo.iMaxNumLength:%d", pbEntryInfo.iMaxNumLength);
+TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::CompleteWriteL:MBDN pbEntryInfo.iMaxNumLength:%d", pbEntryInfo.iMaxNumLength);
 }
 CompleteNotifyStoreEvent( pbEntryInfo.iLocation );
 }
 if ( ( KErrNone == aResult ) ||
 ( KErrGsmSimServSneFull == aResult ) ||
 // Get name
 case RMobilePhoneBookStore::ETagPBText:
 ret = pbBuffer->GetValue( textPtr );
 if ( iMaxTextLen < textPtr.Length() )
 {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_SEPARATEPBDATAL_1, "TSY: CMmPhoneBookStoreTsy::SeparatePBDataL - Text length is more than KPBStoreTextSize " );
+TFLOGSTRING("TSY: CMmPhoneBookStoreTsy::SeparatePBDataL - Text length is more than KPBStoreTextSize " );
 ret = CMmCommonStaticUtility::EpocErrorCode(
 KErrTooBig, KErrGsm0707TextStringTooLong );
 }
 else
 {
 {
 aWriteData->iAnr->AppendL( anrPtr );
 }
 break;
 case RMobilePhoneBookStore::ETagPBText:
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_SEPARATEPBDATAL_2, "TSY: CMmPhoneBookStoreTsy::SeparatePBDataL - RMobilePhoneBookStore::ETagPBAnrStart ETagPBText" );
+TFLOGSTRING("TSY: CMmPhoneBookStoreTsy::SeparatePBDataL - RMobilePhoneBookStore::ETagPBAnrStart ETagPBText" );
 break;
 case RMobilePhoneBookStore::ETagPBTonNpi:
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_SEPARATEPBDATAL_3, "TSY: CMmPhoneBookStoreTsy::SeparatePBDataL - RMobilePhoneBookStore::ETagPBAnrStart ETagPBTonNpi" );
+TFLOGSTRING("TSY: CMmPhoneBookStoreTsy::SeparatePBDataL - RMobilePhoneBookStore::ETagPBAnrStart ETagPBTonNpi" );
 break;
 default:
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_SEPARATEPBDATAL_4, "TSY: CMmPhoneBookStoreTsy::SeparatePBDataL - RMobilePhoneBookStore::ETagPBAnrStart KErrArgument" );
+TFLOGSTRING("TSY: CMmPhoneBookStoreTsy::SeparatePBDataL - RMobilePhoneBookStore::ETagPBAnrStart KErrArgument" );
 ret = KErrArgument;
 break;
 }
 }
 break;
 // Unknown Tag, complete with KErrArgument
 default:
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_SEPARATEPBDATAL_5, "TSY: CMmPhoneBookStoreTsy::SeparatePBDataL - Unknown Tag " );
+TFLOGSTRING("TSY: CMmPhoneBookStoreTsy::SeparatePBDataL - Unknown Tag " );
 ret = KErrArgument;
 break;
 }
 // Get the new field if no errors
 if ( KErrNone == ret )
 {
 ret = pbBuffer->GetTagAndType( tagValue, tagType );
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_SEPARATEPBDATAL_6, "TSY: CMmPhoneBookStoreTsy::SeparatePBDataL - RMobilePhoneBookStore::GetNewField tagValue: %d ", tagValue);
+TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::SeparatePBDataL - RMobilePhoneBookStore::GetNewField tagValue: %d ", tagValue);
 }
 }
 if ( KErrNotFound != ret )
 {
 returnValue = ret;
 }
 }
 // Bad descriptor, no new entry found
 else
 {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_SEPARATEPBDATAL_7, "TSY: CMmPhoneBookStoreTsy::SeparatePBDataL - Bad descriptor " );
+TFLOGSTRING("TSY: CMmPhoneBookStoreTsy::SeparatePBDataL - Bad descriptor " );
 returnValue = KErrArgument;
 }
 CleanupStack::PopAndDestroy(pbBuffer);
 //
 TInt CMmPhoneBookStoreTsy::DeleteL(
 const TTsyReqHandle aTsyReqHandle,
 TInt* aIndex )
 {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_DELETEL_1, "TSY: CMmPhoneBookStoreTsy::DeleteL - aIndex: %d",*aIndex );
+TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::DeleteL - aIndex: %i",*aIndex );
 //SDN phonebook can't be updated by user.
 if (iPhoneBookType == KSDNPhoneBook)
 {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_DELETEL_2, "TSY: CMmPhoneBookStoreTsy::DeleteL - SDN phonebook entry can't be updated");
+TFLOGSTRING("TSY: CMmPhoneBookStoreTsy::DeleteL - SDN phonebook entry can't be updated");
 ReqCompleted( aTsyReqHandle, KErrAccessDenied );
 }
 else
 {
 TInt ret( KErrNone );
 //
 void CMmPhoneBookStoreTsy::CompleteDeleteL(
 TInt aResult,
 CMmDataPackage* aDataPackage )
 {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_COMPLETEDELETEL_1, "TSY: CMmPhoneBookStoreTsy::CompleteDeleteL - Result: %d",aResult );
+TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::CompleteDeleteL - Result: %i",aResult );
 // Reset req handle. Returns the deleted req handle
 TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle(
 EMultimodePhoneStoreDelete );
 if ( EMultimodePhoneBookStoreReqHandleUnknown != reqHandle )
 if ( KADNPhoneBook == iPhoneBookType )
 {
 //Update Adn Max Num Length
 iStoreInfoData->iADNNumberLengthMax =
 pbEntryInfo.iMaxNumLength;
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_COMPLETEDELETEL_2, "TSY: CMmPhoneBookStoreTsy::CompleteDeleteL: pbEntryInfo.iMaxNumLength:%d", pbEntryInfo.iMaxNumLength);
+TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::CompleteDeleteL: pbEntryInfo.iMaxNumLength:%d", pbEntryInfo.iMaxNumLength);
 }
 else if ( KFDNPhoneBook == iPhoneBookType )
 {
 //Update Fdn Max Num Length
 iStoreInfoData->iFDNNumberLengthMax =
 pbEntryInfo.iMaxNumLength;
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_COMPLETEDELETEL_3, "TSY: CMmPhoneBookStoreTsy::CompleteDeleteL:FDN pbEntryInfo.iMaxNumLength:%d", pbEntryInfo.iMaxNumLength);
+TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::CompleteDeleteL:FDN pbEntryInfo.iMaxNumLength:%d", pbEntryInfo.iMaxNumLength);
 }
 else if ( KVMBXPhoneBook == iPhoneBookType )
 {
 //Update VMBX Max Num Length
 if ( 0 < pbEntryInfo.iMaxNumLength )
 {
 iStoreInfoData->iVMBXNumberLengthMax =
 pbEntryInfo.iMaxNumLength;
 }
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_COMPLETEDELETEL_4, "TSY: CMmPhoneBookStoreTsy::CompleteDeleteL:VMBX pbEntryInfo.iMaxNumLength:%d", pbEntryInfo.iMaxNumLength);
+TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::CompleteDeleteL:VMBX pbEntryInfo.iMaxNumLength:%d", pbEntryInfo.iMaxNumLength);
 }
 }
 #ifdef USING_CTSY_DISPATCHER
 // ---------------------------------------------------------------------------
 //
 TInt CMmPhoneBookStoreTsy::DeleteAllL(
 const TTsyReqHandle aTsyReqHandle )
 {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_DELETEALLL_1, "TSY: CMmPhoneBookStoreTsy::DeleteAllL - Handle:%d", aTsyReqHandle );
+TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::DeleteAllL - Handle:%d", aTsyReqHandle );
 //SDN phonebook can't be updated by user.
 if (iPhoneBookType == KSDNPhoneBook)
 {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_DELETEALLL_2, "TSY: CMmPhoneBookStoreTsy::DeleteAllL - SDN phonebook entry can't be updated");
+TFLOGSTRING("TSY: CMmPhoneBookStoreTsy::DeleteAllL - SDN phonebook entry can't be updated");
 ReqCompleted( aTsyReqHandle, KErrAccessDenied );
 }
 else
 {
 TInt ret( KErrNone );
 //
 void CMmPhoneBookStoreTsy::CompleteDeleteAll(
 TInt aResult,
 CMmDataPackage* aDataPackage )
 {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_COMPLETEDELETEALL_1, "TSY: CMmPhoneBookStoreTsy::CompleteDeleteAll - Result: %d",aResult );
+TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::CompleteDeleteAll - Result: %i",aResult );
 // Reset req handle. Returns the deleted req handle
 TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle(
 EMultimodePhoneStoreDeleteAll );
 if ( EMultimodePhoneBookStoreReqHandleUnknown != reqHandle )
 if ( KADNPhoneBook == iPhoneBookType )
 {
 //Update Adn Max Num Length
 iStoreInfoData->iADNNumberLengthMax =
 pbEntryInfo.iMaxNumLength;
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_COMPLETEDELETEALL_2, "TSY: CMmPhoneBookStoreTsy::CompleteDeleteAll: pbEntryInfo.iMaxNumLength:%d", pbEntryInfo.iMaxNumLength);
+TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::CompleteDeleteAll: pbEntryInfo.iMaxNumLength:%d", pbEntryInfo.iMaxNumLength);
 }
 else if ( KFDNPhoneBook == iPhoneBookType )
 {
 //Update Fdn Max Num Length
 iStoreInfoData->iFDNNumberLengthMax =
 pbEntryInfo.iMaxNumLength;
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_COMPLETEDELETEALL_3, "TSY: CMmPhoneBookStoreTsy::CompleteDeleteAll:FDN pbEntryInfo.iMaxNumLength:%d", pbEntryInfo.iMaxNumLength);
+TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::CompleteDeleteAll:FDN pbEntryInfo.iMaxNumLength:%d", pbEntryInfo.iMaxNumLength);
 }
 else if ( KVMBXPhoneBook == iPhoneBookType )
 {
 //Update VMBX Max Num Length
 if ( 0 < pbEntryInfo.iMaxNumLength )
 {
 iStoreInfoData->iVMBXNumberLengthMax =
 pbEntryInfo.iMaxNumLength;
 }
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_COMPLETEDELETEALL_4, "TSY: CMmPhoneBookStoreTsy::CompleteDeleteAll:VMBX pbEntryInfo.iMaxNumLength:%d", pbEntryInfo.iMaxNumLength);
+TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::CompleteDeleteAll:VMBX pbEntryInfo.iMaxNumLength:%d", pbEntryInfo.iMaxNumLength);
 }
 // Complete notify store event
 iMobilePhoneBookStoreEvent = RMobilePhoneStore::KStoreEmpty;
 CompleteNotifyStoreEvent( -1 ); // DeleteAll->index -1
 TInt CMmPhoneBookStoreTsy::GetInfoL(
 const TTsyReqHandle aTsyReqHandle,
 TDes8* aInfo )
 {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_GETINFOL_1, "TSY: CMmPhoneBookStoreTsy::GetInfoL Handle:%d", aTsyReqHandle);
+TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::GetInfoL Handle:%d", aTsyReqHandle);
 TInt ret( KErrNone );
 TTsyReqHandle getInfoHandle =
 iTsyReqHandleStore->GetTsyReqHandle( EMultimodePhoneStoreGetInfo );
 // BDN is not supported feature. Request will be completed later on
 // this method with KErrNone and hard coded BDN storage information
 // will be delivered to the client.
 if ( KBDNPhoneBook == iPhoneBookType )
 {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_GETINFOL_2, "TSY: CMmPhoneBookStoreTsy::GetInfoL - BDN" );
+TFLOGSTRING("TSY: CMmPhoneBookStoreTsy::GetInfoL - BDN" );
 }
 // If PB type is ADN, total entries and used entries already read
 else if ( KADNPhoneBook == iPhoneBookType )
 {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_GETINFOL_3, "TSY: CMmPhoneBookStoreTsy::GetInfoL - ADN" );
+TFLOGSTRING("TSY: CMmPhoneBookStoreTsy::GetInfoL - ADN" );
 ret = KErrNotReady;
 //if cache is ready, set information and get name length
 if ( EFalse != iCacheReady )
 {
 iStoreInfoData->iADNTextLengthMax;
 // The total number of entries
 iPhoneBookInfoChanged->iTotalEntries =
 iStoreInfoData->iADNNumOfEntries;
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_GETINFOL_4, "TSY: CMmPhoneBookStoreTsy::GetInfoL - total entries: %d",iStoreInfoData->iADNNumOfEntries );
+TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::GetInfoL - total entries: %i",iStoreInfoData->iADNNumOfEntries );
 // Check if Email, SNE & ANR Caps are supported + GRP
 if ( iStoreInfoData->iEmailNumOfEntriesPerEntry > 0 )
 {
 iPhoneBookInfoChanged->iCaps =
 iPhoneBookInfoChanged->iCaps |
 RMobilePhoneBookStore::KCapsEmailAddressUsed;
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_GETINFOL_5, "TSY: CMmPhoneBookStoreTsy::GetInfoL ADN -> Email supported" );
+TFLOGSTRING("TSY: CMmPhoneBookStoreTsy::GetInfoL ADN -> Email supported" );
 }
 if ( iStoreInfoData->iSNENumOfEntriesPerEntry > 0 )
 {
 iPhoneBookInfoChanged->iCaps =
 iPhoneBookInfoChanged->iCaps |
 RMobilePhoneBookStore::KCapsSecondNameUsed;
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_GETINFOL_6, "TSY: CMmPhoneBookStoreTsy::GetInfoL ADN -> SNE supported" );
+TFLOGSTRING("TSY: CMmPhoneBookStoreTsy::GetInfoL ADN -> SNE supported" );
 }
 if ( iStoreInfoData->iANRNumOfEntriesPerEntry > 0 )
 {
 iPhoneBookInfoChanged->iCaps =
 iPhoneBookInfoChanged->iCaps |
 RMobilePhoneBookStore::KCapsAdditionalNumUsed;
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_GETINFOL_7, "TSY: CMmPhoneBookStoreTsy::GetInfoL ADN -> ANR supported" );
+TFLOGSTRING("TSY: CMmPhoneBookStoreTsy::GetInfoL ADN -> ANR supported" );
 }
 }
 }
 // If PB type is FDN, total entries and used entries already read
 else if ( KFDNPhoneBook == iPhoneBookType )
 {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_GETINFOL_8, "TSY: CMmPhoneBookStoreTsy::GetInfoL - FDN" );
+TFLOGSTRING("TSY: CMmPhoneBookStoreTsy::GetInfoL - FDN" );
 ret = KErrNotReady;
 //if cache is ready, set information and get name length
 if ( EFalse != iCacheReady )
 {
 iStoreInfoData->iFDNTextLengthMax;
 // The total number of entries
 iPhoneBookInfoChanged->iTotalEntries =
 iStoreInfoData->iFDNNumOfEntries;
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_GETINFOL_9, "TSY: CMmPhoneBookStoreTsy::GetInfoL - total entries: %d",iStoreInfoData->iFDNNumOfEntries );
+TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::GetInfoL - total entries: %i",iStoreInfoData->iFDNNumOfEntries );
 // Set caps by phonebook name
 iPhoneBookInfoChanged->iCaps = KPBTypeFDNCaps;
 }
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_GETINFOL_10, "TSY: CMmPhoneBookStoreTsy::GetInfoL - iMaxNumLength: %d",iPhoneBookInfoChanged->iMaxNumLength );
+TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::GetInfoL - iMaxNumLength: %i",iPhoneBookInfoChanged->iMaxNumLength );
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_GETINFOL_11, "TSY: CMmPhoneBookStoreTsy::GetInfoL - iMaxTextLength: %d",iPhoneBookInfoChanged->iMaxTextLength );
+TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::GetInfoL - iMaxTextLength: %i",iPhoneBookInfoChanged->iMaxTextLength );
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_GETINFOL_12, "TSY: CMmPhoneBookStoreTsy::GetInfoL - iTotalEntries: %d",iPhoneBookInfoChanged->iTotalEntries );
+TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::GetInfoL - iTotalEntries: %i",iPhoneBookInfoChanged->iTotalEntries );
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_GETINFOL_13, "TSY: CMmPhoneBookStoreTsy::GetInfoL - iUsedEntries: %d",iPhoneBookInfoChanged->iUsedEntries );
+TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::GetInfoL - iUsedEntries: %i",iPhoneBookInfoChanged->iUsedEntries );
 }
 else if ( KSDNPhoneBook == iPhoneBookType )
 {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_GETINFOL_14, "TSY: CMmPhoneBookStoreTsy::GetInfoL - SDN" );
+TFLOGSTRING("TSY: CMmPhoneBookStoreTsy::GetInfoL - SDN" );
 ret = KErrNone;
 // The maximum length for the number in a phonebook entry
 iPhoneBookInfoChanged->iMaxNumLength =
 iStoreInfoData->iSDNNumberLengthMax;
 iStoreInfoData->iSDNTextLengthMax;
 // The total number of entries
 iPhoneBookInfoChanged->iTotalEntries =
 iStoreInfoData->iSDNNumOfEntries;
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_GETINFOL_15, "TSY: CMmPhoneBookStoreTsy::GetInfoL - total entries: %d",iStoreInfoData->iSDNNumOfEntries );
+TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::GetInfoL - total entries: %i",iStoreInfoData->iSDNNumOfEntries );
 if ( !iIsUsedEntriesCounted )
 {
 // Check first that SIM server is ready before doing this
 if ( !iIsUsedEntriesCounted &&
 ret = CountEntriesL();
 }
 else
 {
 iPhoneBookInfoChanged = NULL;
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_GETINFOL_16, "TSY: CMmPhoneBookStoreTsy::GetInfoL, not ready to perform CountEntriesL()");
+TFLOGSTRING("TSY: CMmPhoneBookStoreTsy::GetInfoL, not ready to perform CountEntriesL()");
 ret = KErrNotReady;
 }
 }
 }
 //VMBX need to read total and used entries
 else if ( KVMBXPhoneBook == iPhoneBookType )
 {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_GETINFOL_17, "TSY: CMmPhoneBookStoreTsy::GetInfoL - VMBX" );
+TFLOGSTRING("TSY: CMmPhoneBookStoreTsy::GetInfoL - VMBX" );
 ret = KErrNone;
 // The maximum length for the number in a phonebook entry
 iPhoneBookInfoChanged->iMaxNumLength =
 iStoreInfoData->iVMBXNumberLengthMax;
 iStoreInfoData->iVMBXTextLengthMax;
 // The total number of entries
 iPhoneBookInfoChanged->iTotalEntries =
 iStoreInfoData->iVMBXNumOfEntries;
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_GETINFOL_18, "TSY: CMmPhoneBookStoreTsy::GetInfoL - total entries: %d",iStoreInfoData->iVMBXNumOfEntries );
+TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::GetInfoL - total entries: %i",iStoreInfoData->iVMBXNumOfEntries );
 // Set caps by the store info data
 //iPhoneBookInfoChanged->iCaps = iStoreInfoData->iVMBXCaps;
 iPhoneBookInfoChanged->iCaps = KPBTypeVMBXCaps;
 ret = CountEntriesL();
 }
 else
 {
 iPhoneBookInfoChanged = NULL;
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_GETINFOL_19, "TSY: CMmPhoneBookStoreTsy::GetInfoL, not ready to perform CountEntriesL()");
+TFLOGSTRING("TSY: CMmPhoneBookStoreTsy::GetInfoL, not ready to perform CountEntriesL()");
 ret = KErrNotReady;
 }
 }
 }
 //MBDN
 else if ( KMBDNPhoneBook == iPhoneBookType )
 {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_GETINFOL_20, "TSY: CMmPhoneBookStoreTsy::GetInfoL - MBDN" );
+TFLOGSTRING("TSY: CMmPhoneBookStoreTsy::GetInfoL - MBDN" );
 ret = KErrNone;
 // The maximum length for the number in a phonebook entry
 iPhoneBookInfoChanged->iMaxNumLength =
 iStoreInfoData->iMBDNNumberLengthMax;
 iStoreInfoData->iMBDNTextLengthMax;
 // The total number of entries
 iPhoneBookInfoChanged->iTotalEntries =
 iStoreInfoData->iMBDNNumOfEntries;
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_GETINFOL_21, "TSY: CMmPhoneBookStoreTsy::GetInfoL - total entries: %d",iPhoneBookInfoChanged->iTotalEntries );
+TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::GetInfoL - total entries: %i",iPhoneBookInfoChanged->iTotalEntries );
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_GETINFOL_22, "TSY: CMmPhoneBookStoreTsy::GetInfoL - iMaxNumLength: %d",iPhoneBookInfoChanged->iMaxNumLength );
+TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::GetInfoL - iMaxNumLength: %i",iPhoneBookInfoChanged->iMaxNumLength );
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_GETINFOL_23, "TSY: CMmPhoneBookStoreTsy::GetInfoL - iMaxTextLength: %d",iPhoneBookInfoChanged->iMaxTextLength );
+TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::GetInfoL - iMaxTextLength: %i",iPhoneBookInfoChanged->iMaxTextLength );
 // Set caps by the store info data
 iPhoneBookInfoChanged->iCaps = KPBTypeMBDNCaps;
 }
 if ( completeRequest )
 // ---------------------------------------------------------------------------
 //
 void CMmPhoneBookStoreTsy::CompleteGetInfo(
 TInt aError )
 {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_COMPLETEGETINFO_1, "TSY: CMmPhoneBookStoreTsy::CompleteGetInfo - Result: %d", aError );
+TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::CompleteGetInfo - Result: %i", aError );
 // Reset req handle. Returns the deleted req handle
 TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle(
 EMultimodePhoneStoreGetInfo );
 if ( EMultimodePhoneBookStoreReqHandleUnknown != reqHandle )
 iPhoneBookInfoChanged->iCaps = KPBTypeMBDNCaps;
 }
 // Indicates the current number of entries that may be held in this store
 iPhoneBookInfoChanged->iUsedEntries = iUsedEntries;
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_SETINFO_1, "TSY: CMmPhoneBookStoreTsy::SetInfo - used entries: %d",iUsedEntries );
+TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::SetInfo - used entries: %i",iUsedEntries );
 // Indicates the total number of entries
 iPhoneBookInfoChanged->iTotalEntries = KNoInfoAvail;
 }
 // ---------------------------------------------------------------------------
 //
 TInt CMmPhoneBookStoreTsy::GetInfoCancel(
 const TTsyReqHandle aTsyReqHandle )
 {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_GETINFOCANCEL_1, "TSY: CMmPhoneBookStoreTsy::GetInfoCancel - Handle:%d", aTsyReqHandle );
+TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::GetInfoCancel - Handle:%d", aTsyReqHandle );
 // Reset req handle. Returns the deleted req handle
 TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle(
 EMultimodePhoneStoreGetInfo );
 //
 TInt CMmPhoneBookStoreTsy::NotifyStoreEvent(
 RMobilePhoneStore::TMobileStoreEvent *aEvent,
 TInt* aIndex )
 {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_NOTIFYSTOREEVENT_1, "TSY: CMmPhoneBookStoreTsy::NotifyStoreEvent - called" );
+TFLOGSTRING("TSY: CMmPhoneBookStoreTsy::NotifyStoreEvent - called" );
 TTsyReqHandle requestHandle = iTsyReqHandleStore->GetTsyReqHandle(
 EMultimodePhoneStoreNotifyStoreEvent );
 // If request is not running
 // ---------------------------------------------------------------------------
 //
 TInt CMmPhoneBookStoreTsy::NotifyStoreEventCancel(
 const TTsyReqHandle aTsyReqHandle )
 {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_NOTIFYSTOREEVENTCANCEL_1, "TSY: CMmPhoneBookStoreTsy::NotifyStoreEventCancel - called" );
+TFLOGSTRING("TSY: CMmPhoneBookStoreTsy::NotifyStoreEventCancel - called" );
 // Reset req handle. Returns the deleted req handle
 TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle(
 EMultimodePhoneStoreNotifyStoreEvent );
 // ---------------------------------------------------------------------------
 //
 void CMmPhoneBookStoreTsy::CompleteNotifyStoreEvent(
 TInt aLocation )
 {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_COMPLETENOTIFYSTOREEVENT_1, "TSY: CMmPhoneBookStoreTsy::CompleteNotifyStoreEvent - Called" );
+TFLOGSTRING("TSY: CMmPhoneBookStoreTsy::CompleteNotifyStoreEvent - Called" );
 //reset req handle. Returns the deleted req handle
 TTsyReqHandle reqHandle = iTsyReqHandleStore->ResetTsyReqHandle(
 EMultimodePhoneStoreNotifyStoreEvent );
 {
 RMobilePhoneStore::TMobileStoreEvent* phoneBookStoreEvent =
 REINTERPRET_CAST( RMobilePhoneStore::TMobileStoreEvent*,
 iNotifyPhoneBookStoreEventPtr );
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_COMPLETENOTIFYSTOREEVENT_2, "TSY: CMmPhoneBookStoreTsy::CompleteNotifyStoreEvent - StoreEvent %8X ", (TUint)iMobilePhoneBookStoreEvent );
+TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::CompleteNotifyStoreEvent - StoreEvent %i ", iMobilePhoneBookStoreEvent );
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_COMPLETENOTIFYSTOREEVENT_3, "TSY: CMmPhoneBookStoreTsy::CompleteNotifyStoreEvent - location %d ", aLocation );
+TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::CompleteNotifyStoreEvent - location %i ", aLocation );
 // Fill notify information
 *phoneBookStoreEvent = iMobilePhoneBookStoreEvent;
 *iNotifyPhoneBookStoreEventIndexPtr = aLocation;
 ReqCompleted( reqHandle, KErrNone );
 // (other items were commented in a header).
 // ---------------------------------------------------------------------------
 //
 void CMmPhoneBookStoreTsy::ResetVariables()
 {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_RESETVARIABLES_1, "TSY: CMmPhoneBookStoreTsy::ResetVariables" );
+TFLOGSTRING("TSY: CMmPhoneBookStoreTsy::ResetVariables" );
 // Reset phonebooktype
 iPhoneBookType = 0;
 // Cache variables
 // (other items were commented in a header).
 // ---------------------------------------------------------------------------
 //
 void CMmPhoneBookStoreTsy::ResetCache()
 {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_RESETCACHE_1, "TSY: CMmPhoneBookStoreTsy::ResetCache" );
+TFLOGSTRING("TSY: CMmPhoneBookStoreTsy::ResetCache" );
 // SDN and VMBX do not have cache. Skip reset if the cache pointer is null.
 if ( NULL != iPBStoreCache )
 {
 // (other items were commented in a header).
 // ---------------------------------------------------------------------------
 //
 void CMmPhoneBookStoreTsy::ResetCacheReady()
 {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_RESETCACHEREADY_1, "TSY: CMmPhoneBookStoreTsy::ResetCacheReady" );
+TFLOGSTRING("TSY: CMmPhoneBookStoreTsy::ResetCacheReady" );
 iCacheReady = EFalse;
 CMmCustomTsy* mmCustom = NULL;
 if( iMmPhoneTsy )
 {
 mmCustom = iMmPhoneTsy->GetCustomTsy();
 }
 if ( NULL != mmCustom )
 {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_RESETCACHEREADY_2, "TSY: CMmPhoneBookStoreTsy::ResetCacheReady, mmCustom->UpdateCacheStatus - not ready" );
+TFLOGSTRING("TSY: CMmPhoneBookStoreTsy::ResetCacheReady, mmCustom->UpdateCacheStatus - not ready" );
 mmCustom->UpdateCacheStatus( RMmCustomAPI::ECacheNotReady,
 iPhoneBookName );
 }
 }
 //
 void CMmPhoneBookStoreTsy::ReqCompleted(
 const TTsyReqHandle aTsyReqHandle,
 const TInt aError )
 {
-OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_REQCOMPLETED_1, "TSY: CMmPhoneBookStoreTsy::ReqCompleted - Handle:%d Error:%d", aTsyReqHandle, aError);
+TFLOGSTRING3("TSY: CMmPhoneBookStoreTsy::ReqCompleted - Handle:%d Error:%d", aTsyReqHandle, aError);
 CTelObject::ReqCompleted( aTsyReqHandle, aError );
 }
 #endif
 //
 void CMmPhoneBookStoreTsy::SetTypeOfResponse(
 const TInt aReqHandleType,
 const TTsyReqHandle aTsyReqHandle )
 {
-OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_SETTYPEOFRESPONSE_1, "TSY: CMmPhoneBookStoreTsy::SetTypeOfResponse - Handle:%d Type:%d", aTsyReqHandle, aReqHandleType );
+TFLOGSTRING3("TSY: CMmPhoneBookStoreTsy::SetTypeOfResponse - Handle:%d Type:%d", aTsyReqHandle, aReqHandleType );
 TInt timeOut( 0 );
 //example switch
 switch ( aReqHandleType )
 // (other items were commented in a header).
 // ---------------------------------------------------------------------------
 //
 void CMmPhoneBookStoreTsy::ContinueReadL()
 {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_CONTINUEREADL_1, "TSY: CMmPhoneBookStoreTsy::ContinueReadL ");
+TFLOGSTRING("TSY: CMmPhoneBookStoreTsy::ContinueReadL ");
 iRequestedOnPBRead = EFalse;
 //Reguest Read with stored parameters
 if( iReadReqStore )
 {
 // (other items were commented in a header).
 // ---------------------------------------------------------------------------
 //
 TBool CMmPhoneBookStoreTsy::IsPBInitDone()
 {
-OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_ISPBINITDONE_1, "TSY: CMmPhoneBookStoreTsy::IsPBInitDone: - PB %S", iPhoneBookName);
+TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::IsPBInitDone: - PB %S", &iPhoneBookName);
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_ISPBINITDONE_2, "TSY: CMmPhoneBookStoreTsy::IsPBInitDone: - PB iIsPBInitCompleted = %d ", iIsPBInitCompleted );
+TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::IsPBInitDone: - PB iIsPBInitCompleted = %d ", iIsPBInitCompleted );
 return iIsPBInitCompleted;
 }
 // ---------------------------------------------------------------------------
 // (other items were commented in a header).
 // ---------------------------------------------------------------------------
 //
 TUint8 CMmPhoneBookStoreTsy::GetPhonebookType()
 	{
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_GETPHONEBOOKTYPE_1,  "TSY: CMmPhoneBookStoreTsy::GetPhonebookType - iPhoneBookType: %d", iPhoneBookType);
+TFLOGSTRING2( "TSY: CMmPhoneBookStoreTsy::GetPhonebookType - iPhoneBookType: %d", iPhoneBookType);
 	return iPhoneBookType;
 	}
 // ---------------------------------------------------------------------------
 // CMmPhoneBookStoreTsy::CopyLtsyCacheToCtsyCacheL
 // ---------------------------------------------------------------------------
 //
 void CMmPhoneBookStoreTsy::SimIsReady()
 {
-OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_SIMISREADY_1, "TSY: CMmPhoneBookStoreTsy::SimIsReady - iIsPhonebookInitialized: %u", (TUint)iStoreInfoData->iIsPhonebookInitialized);
+TFLOGSTRING2("TSY: CMmPhoneBookStoreTsy::SimIsReady - iIsPhonebookInitialized: %i", iStoreInfoData->iIsPhonebookInitialized);
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_SIMISREADY_2, "TSY: CMmPhoneBookStoreTsy::SimIsReady - before initialization");
+TFLOGSTRING("TSY: CMmPhoneBookStoreTsy::SimIsReady - before initialization");
 // Check if phonebook has been initialized
 if ( !iMmPhoneTsy->IsPBInitActive()
 && ( !iStoreInfoData->iIsPhonebookInitialized )
 )
 {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_SIMISREADY_3, "TSY: CMmPhoneBookStoreTsy::SimIsReady - starting initialization");
+TFLOGSTRING("TSY: CMmPhoneBookStoreTsy::SimIsReady - starting initialization");
 // before phonebook requests, phonebook must be initialized
 iMmPhoneBookStoreExtInterface->InitPhonebook(
 EMmTsyPhoneBookStoreInitIPC, iPhoneBookName );
 iMmPhoneTsy->SetPBInitActiveStatus( ETrue );
 }
 else if (iMmPhoneTsy->IsPBInitActive())
 {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_SIMISREADY_4, "TSY: CMmPhoneBookStoreTsy::SimIsReady - initialization active via other store, waiting for completion");
+TFLOGSTRING("TSY: CMmPhoneBookStoreTsy::SimIsReady - initialization active via other store, waiting for completion");
 iIsPBInitCompleted = EFalse;
 }
 else
 {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_SIMISREADY_5, "TSY: CMmPhoneBookStoreTsy::SimIsReady - Initialization was done via other store");
+TFLOGSTRING("TSY: CMmPhoneBookStoreTsy::SimIsReady - Initialization was done via other store");
 // Set initialization flag
 iIsPBInitCompleted = ETrue;
 }
 if ( iStoreInfoData->iIsPhonebookInitialized
 && ( iPhoneBookType == KADNPhoneBook
 || iPhoneBookType == KFDNPhoneBook ) )
 {
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CMMPHONEBOOKSTORETSY_SIMISREADY_6, "TSY: CMmPhoneBookStoreTsy::SimIsReady - starting caching");
+TFLOGSTRING("TSY: CMmPhoneBookStoreTsy::SimIsReady - starting caching");
 // Call CacheEntries method to read entries from SIM.
 CacheEntriesL();
 }
 }

branch	RCL_3
changeset 66	07a122eea281
parent 65	630d2f34d719
child 74	9200f38b1324