FCL/sf/incubator/modemadaptation: comparison adaptationlayer/tsy/simatktsy

equal deleted inserted replaced

-:6295dc2169f3
+:8486d82aef45
 iPnSend( aPnSend ),
 iPnReceive( aPnReceive ),
 iSatAppName( aName ),
 iSendSmsTsyReqHandle( NULL )
 {
-OstTrace0( TRACE_NORMAL, CTSYSATMESSAGING_CTSYSATMESSAGING, "CTsySatMessaging::CTsySatMessaging" );
+OstTrace0( TRACE_NORMAL,  CTSYSATMESSAGING_CTSYSATMESSAGING_TD, "CTsySatMessaging::CTsySatMessaging" );
 TFLOGSTRING("TSY: CTsySatMessaging::CTsySatMessaging");
 /* None */
 }
 #else
 CTsySatMessaging::CTsySatMessaging
 CMmPhoNetReceiver*  aPnReceive,
 CMmMessageRouter* aRouter
 )
 {
-OstTrace0( TRACE_NORMAL, DUP1_CTSYSATMESSAGING_CTSYSATMESSAGING, "CTsySatMessaging::CTsySatMessaging" );
+OstTrace0( TRACE_NORMAL,  DUP1_CTSYSATMESSAGING_CTSYSATMESSAGING_TD, "CTsySatMessaging::CTsySatMessaging" );
 iPnSend = aPnSend;
 iPnReceive = aPnReceive;
 iRouter = aRouter;
 iSendSmsTsyReqHandle = NULL;
 // Symbian 2nd phase constructor can leave.
 // -----------------------------------------------------------------------------
 //
 void CTsySatMessaging::ConstructL()
 {
-OstTrace0( TRACE_NORMAL, CTSYSATMESSAGING_CONSTRUCTL, "CTsySatMessaging::ConstructL" );
+OstTrace0( TRACE_NORMAL,  CTSYSATMESSAGING_CONSTRUCTL_TD, "CTsySatMessaging::ConstructL" );
 TFLOGSTRING("TSY: CTsySatMessaging::ConstructL");
 // Create message handler object, to receive ISI messages from ISA CellMo
 iSatMessHandler = CSatMessHandler::NewL( this, iPnSend );
 // Initialize SAT icon support implementation
 iSatIcon = CSatIcon::NewL( iSatMessHandler, this );
 // Request IMEI code. Needed in provide local info proactive command.
-iSatMessHandler->InfoSerialNumberReadReq(
+/*iSatMessHandler->InfoSerialNumberReadReq(
-GetTransactionId(), INFO_SB_SN_IMEI_PLAIN );
+GetTransactionId(), INFO_SB_SN_IMEI_PLAIN );*/
 // Request IMEI-SV code. Needed in provide local info proactive command.
-iSatMessHandler->InfoSerialNumberReadReq(
+/*iSatMessHandler->InfoSerialNumberReadReq(
-GetTransactionId(), INFO_SN_IMEI_SV_TO_NET );
+GetTransactionId(), INFO_SN_IMEI_SV_TO_NET );*/
 // Request Network status
 iSatMessHandler->NetCellInfoGetReq(
 GetTransactionId() );
 //Initalize flag, this is used to check if proactiveCommand is ongoing
 iSatTimer->SetProactiveCommandOnGoingStatus( EFalse );
-#ifdef INFO_PP_SIM_OLD_POLL_INTERVAL
+/*#ifdef INFO_PP_SIM_OLD_POLL_INTERVAL
 // Check old poll interval is supported by ME's Product Profile
 iSatMessHandler->InfoPpReadReq( INFO_PP_SIM_OLD_POLL_INTERVAL );
 #endif
 #ifdef INFO_PP_ENHANCED_NETWORK_SELECTION
 // Check INFO_PP_ENHANCED_NETWORK_SELECTION status in product profile
 iSatMessHandler->InfoPpReadReq( INFO_PP_ENHANCED_NETWORK_SELECTION );
-#endif
+#endif*/
 }
 // -----------------------------------------------------------------------------
 // CTsySatMessaging::NewL
 // Two-phased constructor.
 CMmPhoneTsy*            aMmPhone,
 CMmMessageRouterBase*   aRouter,
 TName                   aName
 )
 {
-OstTrace0( TRACE_NORMAL, CTSYSATMESSAGING_NEWL, "CTsySatMessaging::NewL" );
+OstTrace0( TRACE_NORMAL,  CTSYSATMESSAGING_NEWL_TD, "CTsySatMessaging::NewL" );
 TFLOGSTRING("TSY: CTsySatMessaging::NewL");
 // First check that given arguments are not NULL pointers
 if ( ( NULL == aMmPhone ) || ( NULL == aRouter ) )
 {
 TFLOGSTRING("TSY: CTsySatMessaging::NewL, NULL pointers were given \
 leaving!");
-OstTrace0( TRACE_NORMAL, DUP2_CTSYSATMESSAGING_NEWL, "CTsySatMessaging::NewL, NULL pointers were given leaving!" );
+OstTrace0( TRACE_NORMAL,  DUP2_CTSYSATMESSAGING_NEWL_TD, "CTsySatMessaging::NewL, NULL pointers were given leaving!" );
 User::Leave( KErrArgument );
 }
 CMmPhoNetSender* pnSend = NULL;
 CMmPhoNetReceiver* pnReceive = NULL;
 {
 // PhoNet is not correctly initialized. No conditions to survive.
 // This may happen if LicenseeTSY stub is used with real SIM_ATK_TSY
 TFLOGSTRING("TSY: CTsySatMessaging::NewL, Construction failed \
 PhoNet is not initialized, leaving!");
-OstTrace0( TRACE_NORMAL, DUP5_CTSYSATMESSAGING_NEWL, "CTsySatMessaging::NewL, Construction failed PhoNet is not initialized, leaving!" );
+OstTrace0( TRACE_NORMAL,  DUP5_CTSYSATMESSAGING_NEWL_TD, "CTsySatMessaging::NewL, Construction failed PhoNet is not initialized, leaving!" );
 User::Leave( KErrArgument );
 }
 // Create a SatMessaging session
 CTsySatMessaging* subsession = new (ELeave) CTsySatMessaging( aMmPhone,
 EXPORT_C CTsySatMessaging* CTsySatMessaging::NewL
 (
 CMmMessageRouter*   aRouter
 )
 {
-OstTrace0( TRACE_NORMAL, DUP1_CTSYSATMESSAGING_NEWL, "CTsySatMessaging::NewL" );
+OstTrace0( TRACE_NORMAL,  DUP1_CTSYSATMESSAGING_NEWL_TD, "CTsySatMessaging::NewL" );
 TFLOGSTRING("TSY: CTsySatMessaging::NewL");
 // First check that given arguments are not NULL pointers
 if ( NULL == aRouter )
 {
 TFLOGSTRING("TSY: CTsySatMessaging::NewL, NULL pointers were given \
 leaving!");
-OstTrace0( TRACE_NORMAL, DUP3_CTSYSATMESSAGING_NEWL, "CTsySatMessaging::NewL, NULL pointers were given leaving!" );
+OstTrace0( TRACE_NORMAL,  DUP3_CTSYSATMESSAGING_NEWL_TD, "CTsySatMessaging::NewL, NULL pointers were given leaving!" );
 User::Leave( KErrArgument );
 }
 CMmPhoNetSender* pnSend = NULL;
 CMmPhoNetReceiver* pnReceive = NULL;
 {
 // PhoNet is not correctly initialized. No conditions to survive.
 // This may happen if LicenseeTSY stub is used with real SIM_ATK_TSY
 TFLOGSTRING("TSY: CTsySatMessaging::NewL, Construction failed \
 PhoNet is not initialized, leaving!");
-OstTrace0( TRACE_NORMAL, DUP4_CTSYSATMESSAGING_NEWL, "CTsySatMessaging::NewL, Construction failed PhoNet is not initialized, leaving!" );
+OstTrace0( TRACE_NORMAL,  DUP4_CTSYSATMESSAGING_NEWL_TD, "CTsySatMessaging::NewL, Construction failed PhoNet is not initialized, leaving!" );
 User::Leave( KErrArgument );
 }
 // Create a SatMessaging session
 CTsySatMessaging* subsession = new (ELeave) CTsySatMessaging(
 // Destructor.
 // -----------------------------------------------------------------------------
 //
 CTsySatMessaging::~CTsySatMessaging()
 {
-OstTrace0( TRACE_NORMAL, DUP2_CTSYSATMESSAGING_CTSYSATMESSAGING, "CTsySatMessaging::~CTsySatMessaging" );
+OstTrace0( TRACE_NORMAL,  DUP2_CTSYSATMESSAGING_CTSYSATMESSAGING_TD, "CTsySatMessaging::~CTsySatMessaging" );
 TFLOGSTRING("TSY: CTsySatMessaging::~CTsySatMessaging");
 // Delete message handler object, SAT SMS sending
 delete iSatMessHandler;
 CTelObject* CTsySatMessaging::OpenNewObjectByNameL
 (
 const TDesC& /* aName */    // Name of the object
 )
 {
-OstTrace0( TRACE_NORMAL, CTSYSATMESSAGING_OPENNEWOBJECTBYNAMEL, "CTsySatMessaging::OpenNewObjectByNameL" );
+OstTrace0( TRACE_NORMAL,  CTSYSATMESSAGING_OPENNEWOBJECTBYNAMEL_TD, "CTsySatMessaging::OpenNewObjectByNameL" );
 TFLOGSTRING("TSY: CTsySatMessaging::OpenNewObjectByNameL");
 User::Leave( KErrNotSupported );
 return NULL;
 }
 CTelObject* CTsySatMessaging::OpenNewObjectL
 (
 TDes& /*aNewName*/  // Name of the new object
 )
 {
-OstTrace0( TRACE_NORMAL, CTSYSATMESSAGING_OPENNEWOBJECTL, "CTsySatMessaging::OpenNewObjectL" );
+OstTrace0( TRACE_NORMAL,  CTSYSATMESSAGING_OPENNEWOBJECTL_TD, "CTsySatMessaging::OpenNewObjectL" );
 TFLOGSTRING("TSY: CTsySatMessaging::OpenNewObjectL");
 User::Leave( KErrNotSupported );
 return NULL;
 }
 const TTsyReqHandle aTsyReqHandle,  // Request handle
 const TInt          aIpc,           // IPC number of request
 const TDataPackage& aPackage        // Contains parameters for request
 )
 {
-OstTraceExt2( TRACE_NORMAL, CTSYSATMESSAGING_EXTFUNC, "CTsySatMessaging::ExtFunc ReqHandle: %d IPC: %d", TInt(aTsyReqHandle), aIpc );
+OstTraceExt2( TRACE_NORMAL,  CTSYSATMESSAGING_EXTFUNC_TD, "CTsySatMessaging::ExtFunc ReqHandle: %d IPC: %d", TInt(aTsyReqHandle), aIpc );
 TFLOGSTRING3("TSY: CTsySatMessaging::ExtFunc ReqHandle=%d IPC=%d",
 aTsyReqHandle, aIpc);
 // some SAT functions need trapping, use two level function where
 // first one is just a trap harness
 const TTsyReqHandle aTsyReqHandle,  // Request handle
 const TInt          aIpc,           // IPC number of request
 const TDataPackage& aPackage        // Contains parameters for request
 )
 {
-OstTrace0( TRACE_NORMAL, CTSYSATMESSAGING_DOEXTFUNCL, "CTsySatMessaging::DoExtFuncL" );
+OstTrace0( TRACE_NORMAL,  CTSYSATMESSAGING_DOEXTFUNCL_TD, "CTsySatMessaging::DoExtFuncL" );
 TFLOGSTRING("TSY: CTsySatMessaging::DoExtFuncL");
 TAny* dataPtr=aPackage.Ptr1();
 TAny* dataPtr2=aPackage.Ptr2();
 switch ( aIpc )
 {
 }
 // Set ret to KErrNotSupported, function not supported
 default:
 {
 TFLOGSTRING2("TSY: CTsySatMessaging::DoExtFuncL unsupported IPC %d", aIpc);
-OstTrace1( TRACE_NORMAL, DUP1_CTSYSATMESSAGING_DOEXTFUNCL, "CTsySatMessaging::DoExtFuncL unsupported IPC %d", aIpc );
+OstTrace1( TRACE_NORMAL,  DUP1_CTSYSATMESSAGING_DOEXTFUNCL_TD, "CTsySatMessaging::DoExtFuncL unsupported IPC %d", aIpc );
 ReqCompleted( aTsyReqHandle, KErrNotSupported );
 break;
 }
 }
 (
 const TInt          aIpc,           // IPC number of request
 const TTsyReqHandle aTsyReqHandle   // Request handle
 )
 {
-OstTraceExt2( TRACE_NORMAL, CTSYSATMESSAGING_CANCELSERVICE, "CTsySatMessaging::CancelService ReqHandle=%d, IPC=%d", TInt(aTsyReqHandle), aIpc );
+OstTraceExt2( TRACE_NORMAL,  CTSYSATMESSAGING_CANCELSERVICE_TD, "CTsySatMessaging::CancelService ReqHandle=%d, IPC=%d", TInt(aTsyReqHandle), aIpc );
 TFLOGSTRING3("TSY: CTsySatMessaging::CancelService ReqHandle=%d IPC=%d",aTsyReqHandle, aIpc);
 TInt ret( KErrNone );
 switch ( aIpc )
 {
 case ESatNotifyDisplayTextPCmd:
 //
 // ESatGetMeSideSatProfile
 default:
 {
 TFLOGSTRING2("TSY: CTsySatMessaging::CancelService invalid IPC %d",aIpc);
-OstTrace1( TRACE_NORMAL, DUP1_CTSYSATMESSAGING_CANCELSERVICE, "CTsySatMessaging::CancelService invalid IPC %d", aIpc );
+OstTrace1( TRACE_NORMAL,  DUP1_CTSYSATMESSAGING_CANCELSERVICE_TD, "CTsySatMessaging::CancelService invalid IPC %d", aIpc );
 ret = KErrGeneral;
 break;
 }
 }
 CTelObject::TReqMode CTsySatMessaging::ReqModeL
 (
 const TInt aIpc     // IPC number of request
 )
 {
-OstTrace1( TRACE_NORMAL, CTSYSATMESSAGING_REQMODEL, "CTsySatMessaging::ReqModeL, IPC=%d", aIpc );
+OstTrace1( TRACE_NORMAL,  CTSYSATMESSAGING_REQMODEL_TD, "CTsySatMessaging::ReqModeL, IPC=%d", aIpc );
 TFLOGSTRING2("TSY: CTsySatMessaging::ReqModeL, IPC = %d",aIpc);
 CTelObject::TReqMode ret = 0;
 switch ( aIpc )
 {
 // Multiple Completion Services
 break;
 }
 default:
 {
 TFLOGSTRING2( "TSY: CTsySatMessaging::ReqModeL unsupported IPC %d", aIpc );
-OstTrace1( TRACE_NORMAL, DUP1_CTSYSATMESSAGING_REQMODEL, "CTsySatMessaging::ReqModeL unsupported IPC %d", aIpc );
+OstTrace1( TRACE_NORMAL,  DUP1_CTSYSATMESSAGING_REQMODEL_TD, "CTsySatMessaging::ReqModeL unsupported IPC %d", aIpc );
 User::Leave( KErrNotSupported );
 break;
 }
 }
 // (other items were commented in a header).
 // -----------------------------------------------------------------------------
 //
 void CTsySatMessaging::Init()
 {
-OstTrace0( TRACE_NORMAL, CTSYSATMESSAGING_INIT, "CTsySatMessaging::Init" );
+OstTrace0( TRACE_NORMAL,  CTSYSATMESSAGING_INIT_TD, "CTsySatMessaging::Init" );
 TFLOGSTRING("TSY: CTsySatMessaging::Init");
 // none
 }
 // -----------------------------------------------------------------------------
 TInt CTsySatMessaging::RegisterNotification
 (
 const TInt aIpc     // IPC number of request
 )
 {
-OstTrace1( TRACE_NORMAL, CTSYSATMESSAGING_REGISTERNOTIFICATION, "CTsySatMessaging::RegisterNotification, IPC = %d", aIpc );
+OstTrace1( TRACE_NORMAL,  CTSYSATMESSAGING_REGISTERNOTIFICATION_TD, "CTsySatMessaging::RegisterNotification, IPC = %d", aIpc );
 TFLOGSTRING2("TSY: CTsySatMessaging::RegisterNotification, IPC = %d",aIpc);
 // Initialize return value
 TInt ret( KErrNone );
 switch ( aIpc )
 {
 //
 default:
 {
 // Unknown or invalid IPC
 TFLOGSTRING2("TSY: CTsySatMessaging::RegisterNotification, unsupported IPC %d", aIpc);
-OstTrace1( TRACE_NORMAL, DUP1_CTSYSATMESSAGING_REGISTERNOTIFICATION, "CTsySatMessaging::RegisterNotification unsupported IPC %d", aIpc );
+OstTrace1( TRACE_NORMAL,  DUP1_CTSYSATMESSAGING_REGISTERNOTIFICATION_TD, "CTsySatMessaging::RegisterNotification unsupported IPC %d", aIpc );
 ret = KErrNotSupported;
 break;
 }
 }
 TInt CTsySatMessaging::DeregisterNotification
 (
 const TInt aIpc     // IPC number of request
 )
 {
-OstTrace1( TRACE_NORMAL, CTSYSATMESSAGING_DEREGISTERNOTIFICATION, "CTsySatMessaging::DeregisterNotification, IPC = %d", aIpc );
+OstTrace1( TRACE_NORMAL,  CTSYSATMESSAGING_DEREGISTERNOTIFICATION_TD, "CTsySatMessaging::DeregisterNotification, IPC = %d", aIpc );
 TFLOGSTRING2( "TSY: CTsySatMessaging::DeregisterNotification\
 IPC = %d", aIpc );
 // Initialize return value
 TInt ret( KErrNone );
 switch ( aIpc )
 default:
 {
 // Unknown or invalid IPC
 TFLOGSTRING2("TSY: CTsySatMessaging::DeregisterNotification \
 unsupported IPC %d", aIpc);
-OstTrace1( TRACE_NORMAL, DUP1_CTSYSATMESSAGING_DEREGISTERNOTIFICATION, "CTsySatMessaging::DeregisterNotification unsupported IPC %d", aIpc );
+OstTrace1( TRACE_NORMAL,  DUP1_CTSYSATMESSAGING_DEREGISTERNOTIFICATION_TD, "CTsySatMessaging::DeregisterNotification unsupported IPC %d", aIpc );
 ret = KErrNotSupported;
 break;
 }
 }
 TInt CTsySatMessaging::NumberOfSlotsL
 (
 const TInt aIpc        // IPC number of request
 )
 {
-OstTrace1( TRACE_NORMAL, CTSYSATMESSAGING_NUMBEROFSLOTSL, "CTsySatMessaging::NumberOfSlotsL IPC %d", aIpc );
+OstTrace1( TRACE_NORMAL,  CTSYSATMESSAGING_NUMBEROFSLOTSL_TD, "CTsySatMessaging::NumberOfSlotsL IPC %d", aIpc );
 TFLOGSTRING2("TSY: CTsySatMessaging::NumberOfSlotsL IPC %d", aIpc);
 TInt numberOfSlots( 1 );
 switch ( aIpc )
 {
 case ESatNotifyDisplayTextPCmd:
 default:
 {
 // Unknown or invalid IPC
 TFLOGSTRING2( "TSY: CTsySatMessaging::NumberOfSlotsL\
 unsupported IPC %d", aIpc );
-OstTrace1( TRACE_NORMAL, DUP1_CTSYSATMESSAGING_NUMBEROFSLOTSL, "CTsySatMessaging::NumberOfSlotsL unsupported IPC %d", aIpc );
+OstTrace1( TRACE_NORMAL,  DUP1_CTSYSATMESSAGING_NUMBEROFSLOTSL_TD, "CTsySatMessaging::NumberOfSlotsL unsupported IPC %d", aIpc );
 User::Leave( KErrNotSupported );
 break;
 }
 }
 // (other items were commented in a header).
 // -----------------------------------------------------------------------------
 //
 CSatMessHandler* CTsySatMessaging::GetSatMessHandler()
 {
-OstTrace0( TRACE_NORMAL, CTSYSATMESSAGING_GETSATMESSHANDLER, "CTsySatMessaging::GetSatMessHandler" );
+OstTrace0( TRACE_NORMAL,  CTSYSATMESSAGING_GETSATMESSHANDLER_TD, "CTsySatMessaging::GetSatMessHandler" );
 TFLOGSTRING("TSY:CTsySatMessaging::GetSatMessHandler");
 // Pointer to SAT message handler
 return iSatMessHandler;
 }
 // (other items were commented in a header).
 // -----------------------------------------------------------------------------
 //
 CSatFlightModeStatus* CTsySatMessaging::GetSatFlightModeStatus()
 {
-OstTrace0( TRACE_NORMAL, CTSYSATMESSAGING_GETSATFLIGHTMODESTATUS, "CTsySatMessaging::GetSatFlightModeStatus" );
+OstTrace0( TRACE_NORMAL,  CTSYSATMESSAGING_GETSATFLIGHTMODESTATUS_TD, "CTsySatMessaging::GetSatFlightModeStatus" );
 TFLOGSTRING("TSY:CTsySatMessaging::GetSatFlightModeStatus");
 // Pointer to SAT flight mode status
 return iSatFlightModeStatus;
 }
 TInt CTsySatMessaging::CompleteSendSmsMessage
 (
 TInt aStatus  // Message sending status from MMSMS
 )
 {
-OstTrace0( TRACE_NORMAL, CTSYSATMESSAGING_COMPLETESENDSMSMESSAGE, "CTsySatMessaging::CompleteSendSmsMessage" );
+OstTrace0( TRACE_NORMAL,  CTSYSATMESSAGING_COMPLETESENDSMSMESSAGE_TD, "CTsySatMessaging::CompleteSendSmsMessage" );
 TFLOGSTRING("TSY: CTsySatMessaging::CompleteSendSmsMessage, entered");
 if ( iSendSmsTsyReqHandle )
 {
 ReqCompleted( iSendSmsTsyReqHandle, aStatus );
 iSendSmsTsyReqHandle = NULL;
 (
 TDes8*          aSelection,     // Contains menu selection parameters
 TTsyReqHandle   aTsyReqHandle   // Request handle
 )
 {
-OstTrace0( TRACE_NORMAL, CTSYSATMESSAGING_MENUSELECTION, "CTsySatMessaging::MenuSelection" );
+OstTrace0( TRACE_NORMAL,  CTSYSATMESSAGING_MENUSELECTION_TD, "CTsySatMessaging::MenuSelection" );
 TFLOGSTRING("TSY:CTsySatMessaging::MenuSelection");
 TInt ret( KErrNone );
 RSat::TMenuSelectionV1Pckg* aPckg =
 REINTERPRET_CAST( RSat::TMenuSelectionV1Pckg*, aSelection );
 RSat::TMenuSelectionV1& selectionV1 = ( *aPckg ) ();
 TFLOGSTRING3("TSY:CTsySatMessaging::MenuSelection, iItemId %x, Help: %c",
 selectionV1.iItemId, selectionV1.iHelp );
-OstTraceExt1( TRACE_NORMAL, DUP1_CTSYSATMESSAGING_MENUSELECTION, "CTsySatMessaging::MenuSelection iItemId: %hhu", selectionV1.iItemId );
+OstTraceExt1( TRACE_NORMAL,  DUP1_CTSYSATMESSAGING_MENUSELECTION_TD, "CTsySatMessaging::MenuSelection iItemId: %hhu", selectionV1.iItemId );
-OstTrace1( TRACE_NORMAL, DUP2_CTSYSATMESSAGING_MENUSELECTION, "CTsySatMessaging::MenuSelection Help: %{THelpRequest}", selectionV1.iHelp );
+OstTrace1( TRACE_NORMAL,  DUP2_CTSYSATMESSAGING_MENUSELECTION_TD, "CTsySatMessaging::MenuSelection Help: %{THelpRequest}", selectionV1.iHelp );
 // Creating the menu selection message
 if ( selectionV1.iHelp == RSat::EHelpRequested )
 {
 // Help requested
 (
 TDes8*          /*aPackage*/,     //package containing pointer to client
 TTsyReqHandle   aTsyReqHandle     //tsy request handle
 )
 {
-OstTrace0( TRACE_NORMAL, CTSYSATMESSAGING_NOTIFYCBDOWNLOAD, "CTsySatMessaging::NotifyCbDownload" );
+OstTrace0( TRACE_NORMAL,  CTSYSATMESSAGING_NOTIFYCBDOWNLOAD_TD, "CTsySatMessaging::NotifyCbDownload" );
 TFLOGSTRING("TSY:CTsySatMessaging::NotifyCbDownload");
 TInt ret( KErrNone );
 ReqCompleted( aTsyReqHandle, ret );
 return ret;
 }
 (
 TDes8*          /*aPackage*/,   //package containing pointer to client
 TTsyReqHandle   aTsyReqHandle   //tsy request handle
 )
 {
-OstTrace0( TRACE_NORMAL, CTSYSATMESSAGING_NOTIFYSMSPPDOWNLOAD, "CTsySatMessaging::NotifySmsPpDownload" );
+OstTrace0( TRACE_NORMAL,  CTSYSATMESSAGING_NOTIFYSMSPPDOWNLOAD_TD, "CTsySatMessaging::NotifySmsPpDownload" );
 TFLOGSTRING("TSY:CTsySatMessaging::NotifySmsPpDownload");
 TInt ret( KErrNone );
 ReqCompleted( aTsyReqHandle, ret );
 return ret;
 }
 TDes8*          aMsg,           // Pointer to message
 TUint16*        /*aMsgRef*/,    // Message reference
 TTsyReqHandle   aTsyReqHandle   // Request handle
 )
 {
-OstTrace0( TRACE_NORMAL, CTSYSATMESSAGING_SENDMESSAGENOLOGGINGL, "CTsySatMessaging::SendMessageNoLoggingL" );
+OstTrace0( TRACE_NORMAL,  CTSYSATMESSAGING_SENDMESSAGENOLOGGINGL_TD, "CTsySatMessaging::SendMessageNoLoggingL" );
 TFLOGSTRING("TSY: CTsySatMessaging::SendMessageNoLoggingL");
 TInt ret( KErrNone );
 // Save Reqhandle for CompleteSendSmsMessage
 iSendSmsTsyReqHandle = aTsyReqHandle;
 RSat::TSatSmsV1Pckg* aPckg = REINTERPRET_CAST( RSat::TSatSmsV1Pckg*, aMsg );
 #if (NCP_COMMON_S60_VERSION_SUPPORT==S60_VERSION_32)
 // Get SMS messaging class pointer for sending sms messages
 CMmSmsTsy* mmSmsTsy = iMmPhone->SmsSession();
 TFLOGSTRING2("TSY: CTsySatMessaging::SendMessageNoLoggingL, \
 mmSmsTsy: %x", mmSmsTsy );
-OstTrace1( TRACE_NORMAL, DUP1_CTSYSATMESSAGING_SENDMESSAGENOLOGGINGL, "CTsySatMessaging::SendMessageNoLoggingL, mmSmsTsy: %x", mmSmsTsy );
+OstTrace1( TRACE_NORMAL,  DUP1_CTSYSATMESSAGING_SENDMESSAGENOLOGGINGL_TD, "CTsySatMessaging::SendMessageNoLoggingL, mmSmsTsy: %x", mmSmsTsy );
 if ( mmSmsTsy ) // Check that SMS session exist
 {
 // Call SMS sending function from MMSMS
 ret = mmSmsTsy->SendSatMessage( this, pdu, sca, &numberType,
 &numberPlan, EFalse, aTsyReqHandle );
 TFLOGSTRING2("TSY: CTsySatMessaging::SendMessageNoLoggingL, \
 SendSmsMessage done, ret: %x", ret );
-OstTrace1( TRACE_NORMAL, DUP2_CTSYSATMESSAGING_SENDMESSAGENOLOGGINGL, "CTsySatMessaging::SendMessageNoLoggingL, SendSmsMessage done, ret: %d", ret );
+OstTrace1( TRACE_NORMAL,  DUP2_CTSYSATMESSAGING_SENDMESSAGENOLOGGINGL_TD, "CTsySatMessaging::SendMessageNoLoggingL, SendSmsMessage done, ret: %d", ret );
 }
 else
 {
 // No SMS session.
 ret = KErrNotReady;
 TFLOGSTRING("TSY: CTsySatMessaging::SendMessageNoLoggingL, \
 no SMS session!");
-OstTrace0( TRACE_NORMAL, DUP3_CTSYSATMESSAGING_SENDMESSAGENOLOGGINGL, "CTsySatMessaging::SendMessageNoLoggingL, no SMS session!" );
+OstTrace0( TRACE_NORMAL,  DUP3_CTSYSATMESSAGING_SENDMESSAGENOLOGGINGL_TD, "CTsySatMessaging::SendMessageNoLoggingL, no SMS session!" );
 }
 #else //NCP_COMMON_S60_VERSION_SUPPORT
 // Deliver attributes to message handler by using
 // TMobileSmsSendAttributesV1 class.
 RMobileSmsMessaging::TMobileSmsSendAttributesV1 msgAttrib;
 else // SCA missing
 {
 ret = KErrGeneral;
 TFLOGSTRING("TSY: CTsySatMessaging::SendMessageNoLoggingL, \
 SCA missing");
-OstTrace0( TRACE_NORMAL, DUP4_CTSYSATMESSAGING_SENDMESSAGENOLOGGINGL, "CTsySatMessaging::SendMessageNoLoggingL, SCA missing" );
+OstTrace0( TRACE_NORMAL,  DUP4_CTSYSATMESSAGING_SENDMESSAGENOLOGGINGL_TD, "CTsySatMessaging::SendMessageNoLoggingL, SCA missing" );
 }
 // Failure in sending of SAT SMS, call complete method
 if ( KErrNone != ret )
 {
 CompleteSendSmsMessage( ret );
 TFLOGSTRING("TSY: CTsySatMessaging::SendMessageNoLoggingL, \
 failure sending SAT SMS, complete");
-OstTrace0( TRACE_NORMAL, DUP5_CTSYSATMESSAGING_SENDMESSAGENOLOGGINGL, "CTsySatMessaging::SendMessageNoLoggingL, failure sending SAT SMS, complete" );
+OstTrace0( TRACE_NORMAL,  DUP5_CTSYSATMESSAGING_SENDMESSAGENOLOGGINGL_TD, "CTsySatMessaging::SendMessageNoLoggingL, failure sending SAT SMS, complete" );
 }
 return ret;
 }
 RSat::TPCmd*    aPCmd,          // SAT command identifier
 TDes8*          aRsp,           // Response
 TTsyReqHandle   aTsyReqHandle   // Request handle
 )
 {
-OstTrace0( TRACE_NORMAL, CTSYSATMESSAGING_TERMINALRESPONSE, "CTsySatMessaging::TerminalResponse" );
+OstTrace0( TRACE_NORMAL,  CTSYSATMESSAGING_TERMINALRESPONSE_TD, "CTsySatMessaging::TerminalResponse" );
 TFLOGSTRING("TSY: CTsySatMessaging::TerminalResponse");
 TInt ret( KErrNone );
 switch ( *aPCmd )
 {
 case RSat::EDisplayText:
 ret = iNotifySendData->TerminalResponse( aRsp );
 break;
 default:
 TFLOGSTRING("TSY: CTsySatMessaging::TerminalResponse, \
 PCmd not supported");
-OstTrace0( TRACE_NORMAL, DUP1_CTSYSATMESSAGING_TERMINALRESPONSE, "CTsySatMessaging::TerminalResponse, PCmd not supported" );
+OstTrace0( TRACE_NORMAL,  DUP1_CTSYSATMESSAGING_TERMINALRESPONSE_TD, "CTsySatMessaging::TerminalResponse, PCmd not supported" );
 ret =  KErrGeneral;
 break;
 }
 ReqCompleted( aTsyReqHandle, ret );
 // (other items were commented in a header).
 // -----------------------------------------------------------------------------
 //
 void CTsySatMessaging::PCmdReceivedL( const TIsiReceiveC& aIsiMessage )
 {
-OstTrace0( TRACE_NORMAL, CTSYSATMESSAGING_PCMDRECEIVEDL, "CTsySatMessaging::PCmdReceivedL" );
+OstTrace0( TRACE_NORMAL,  CTSYSATMESSAGING_PCMDRECEIVEDL_TD, "CTsySatMessaging::PCmdReceivedL" );
 TFLOGSTRING("TSY: CTsySatMessaging::PCmdReceivedL");
 CBerTlv berTlv;
 berTlv.BerTlv( aIsiMessage );
 CTlv commandDetails;
 berTlv.TlvByTagValue( &commandDetails, KTlvCommandDetailsTag );
 iNotifySendData->MessageReceived( aIsiMessage );
 break;
 default:
 {
 TFLOGSTRING("TSY: CTsySatMessaging::PCmdReceivedL, PCmd not supported");
-OstTrace0( TRACE_NORMAL, DUP1_CTSYSATMESSAGING_PCMDRECEIVEDL, "CTsySatMessaging::PCmdReceivedL, PCmd not supported" );
+OstTrace0( TRACE_NORMAL,  DUP1_CTSYSATMESSAGING_PCMDRECEIVEDL_TD, "CTsySatMessaging::PCmdReceivedL, PCmd not supported" );
 // If proactive command is not supported, terminal response
 // with "Command is beyond ME's capabilities" information
 // will be send. ProactiveCommandOngoing status will be set
 // to EFalse in SendTerminalResponseL().
 (
 TInt aTimerId,
 TUint32 aTimerValue
 )
 {
-OstTrace0( TRACE_NORMAL, CTSYSATMESSAGING_TIMEREXPIRATION, "CTsySatMessaging::TimerExpiration" );
+OstTrace0( TRACE_NORMAL,  CTSYSATMESSAGING_TIMEREXPIRATION_TD, "CTsySatMessaging::TimerExpiration" );
 TFLOGSTRING("TSY: CTsySatMessaging::TimerExpiration");
 TUint8 time[3] = {0, 0, 0};
 TInt num[3];
 num[0] = aTimerValue/3600;         //hours
 num[1] = ( aTimerValue%3600 )/60;  //minutes
 // (other items were commented in a header).
 // -----------------------------------------------------------------------------
 //
 CSatTimer* CTsySatMessaging::GetSatTimer()
 {
-OstTrace0( TRACE_NORMAL, CTSYSATMESSAGING_GETSATTIMER, "CTsySatMessaging::GetSatTimer" );
+OstTrace0( TRACE_NORMAL,  CTSYSATMESSAGING_GETSATTIMER_TD, "CTsySatMessaging::GetSatTimer" );
 // Pointer to SAT timer
 return iSatTimer;
 }
 // -----------------------------------------------------------------------------
 // (other items were commented in a header).
 // -----------------------------------------------------------------------------
 //
 CSatNotifyRefresh* CTsySatMessaging::GetNotifyRefresh()
 {
-OstTrace0( TRACE_NORMAL, CTSYSATMESSAGING_GETNOTIFYREFRESH, "CTsySatMessaging::GetNotifyRefresh" );
+OstTrace0( TRACE_NORMAL,  CTSYSATMESSAGING_GETNOTIFYREFRESH_TD, "CTsySatMessaging::GetNotifyRefresh" );
 return iNotifyRefresh;
 }
 // -----------------------------------------------------------------------------
 // CTsySatMessaging::GetDataDownload
 // (other items were commented in a header).
 // -----------------------------------------------------------------------------
 //
 CSatDataDownload* CTsySatMessaging::GetDataDownload()
 {
-OstTrace0( TRACE_NORMAL, CTSYSATMESSAGING_GETDATADOWNLOAD, "CTsySatMessaging::GetDataDownload" );
+OstTrace0( TRACE_NORMAL,  CTSYSATMESSAGING_GETDATADOWNLOAD_TD, "CTsySatMessaging::GetDataDownload" );
 return iSatDataDownload;
 }
 // -----------------------------------------------------------------------------
 // CTsySatMessaging::GetNotifyPollInterval
 // (other items were commented in a header).
 // -----------------------------------------------------------------------------
 //
 CSatNotifyPollInterval* CTsySatMessaging::GetNotifyPollInterval()
 {
-OstTrace0( TRACE_NORMAL, CTSYSATMESSAGING_GETNOTIFYPOLLINTERVAL, "CTsySatMessaging::GetNotifyPollInterval" );
+OstTrace0( TRACE_NORMAL,  CTSYSATMESSAGING_GETNOTIFYPOLLINTERVAL_TD, "CTsySatMessaging::GetNotifyPollInterval" );
 return iNotifyPollInterval;
 }
 // -----------------------------------------------------------------------------
 // CTsySatMessaging::GetMoSmsCtrl
 // (other items were commented in a header).
 // -----------------------------------------------------------------------------
 //
 CSatMoSmsCtrl* CTsySatMessaging::GetMoSmsCtrl()
 {
-OstTrace0( TRACE_NORMAL, CTSYSATMESSAGING_GETMOSMSCTRL, "CTsySatMessaging::GetMoSmsCtrl" );
+OstTrace0( TRACE_NORMAL,  CTSYSATMESSAGING_GETMOSMSCTRL_TD, "CTsySatMessaging::GetMoSmsCtrl" );
 return iSatMoSmsCtrl;
 }
 // -----------------------------------------------------------------------------
 // CTsySatMessaging::GetEventDownload
 // (other items were commented in a header).
 // -----------------------------------------------------------------------------
 //
 CSatEventDownload* CTsySatMessaging::GetEventDownload()
 {
-OstTrace0( TRACE_NORMAL, CTSYSATMESSAGING_GETEVENTDOWNLOAD, "CTsySatMessaging::GetEventDownload" );
+OstTrace0( TRACE_NORMAL,  CTSYSATMESSAGING_GETEVENTDOWNLOAD_TD, "CTsySatMessaging::GetEventDownload" );
 return iEventDownload;
 }
 // -----------------------------------------------------------------------------
 // CTsySatMessaging::GetNotifyPollingOff
 // (other items were commented in a header).
 // -----------------------------------------------------------------------------
 //
 CSatNotifyPollingOff* CTsySatMessaging::GetNotifyPollingOff()
 {
-OstTrace0( TRACE_NORMAL, CTSYSATMESSAGING_GETNOTIFYPOLLINGOFF, "CTsySatMessaging::GetNotifyPollingOff" );
+OstTrace0( TRACE_NORMAL,  CTSYSATMESSAGING_GETNOTIFYPOLLINGOFF_TD, "CTsySatMessaging::GetNotifyPollingOff" );
 return iNotifyPollingOff;
 }
 // -----------------------------------------------------------------------------
 // CTsySatMessaging::GetNotifyLocalInfo
 // (other items were commented in a header).
 // -----------------------------------------------------------------------------
 //
 CSatNotifyLocalInfo* CTsySatMessaging::GetNotifyLocalInfo()
 {
-OstTrace0( TRACE_NORMAL, CTSYSATMESSAGING_GETNOTIFYLOCALINFO, "CTsySatMessaging::GetNotifyLocalInfo" );
+OstTrace0( TRACE_NORMAL,  CTSYSATMESSAGING_GETNOTIFYLOCALINFO_TD, "CTsySatMessaging::GetNotifyLocalInfo" );
 return iNotifyLocalInfo;
 }
 // -----------------------------------------------------------------------------
 // CTsySatMessaging::EventDownloadReceived
 void CTsySatMessaging::EventDownloadReceived
 (
 const TIsiReceiveC& aIsiMessage //Event download message
 )
 {
-OstTrace0( TRACE_NORMAL, CTSYSATMESSAGING_EVENTDOWNLOADRECEIVED, "CTsySatMessaging::EventDownloadReceived" );
+OstTrace0( TRACE_NORMAL,  CTSYSATMESSAGING_EVENTDOWNLOADRECEIVED_TD, "CTsySatMessaging::EventDownloadReceived" );
 iEventDownload->MessageReceived( aIsiMessage );
 }
 // -----------------------------------------------------------------------------
 // CTsySatMessaging::SetUpEventList
 void CTsySatMessaging::SetUpEventList
 (
 TUint32 aEvents //events to be monitored
 )
 {
-OstTrace0( TRACE_NORMAL, CTSYSATMESSAGING_SETUPEVENTLIST, "CTsySatMessaging::SetUpEventList" );
+OstTrace0( TRACE_NORMAL,  CTSYSATMESSAGING_SETUPEVENTLIST_TD, "CTsySatMessaging::SetUpEventList" );
 iEventDownload->SetUpEventList( aEvents );
 }
 // -----------------------------------------------------------------------------
 // CTsySatMessaging::SessionEnd
 void CTsySatMessaging::SessionEnd
 (
 const TIsiReceiveC& aIsiMessage //message ending session
 )
 {
-OstTrace0( TRACE_NORMAL, CTSYSATMESSAGING_SESSIONEND, "CTsySatMessaging::SessionEnd" );
+OstTrace0( TRACE_NORMAL,  CTSYSATMESSAGING_SESSIONEND_TD, "CTsySatMessaging::SessionEnd" );
 iNotifySimSessionEnd->MessageReceived( aIsiMessage );
 }
 // -----------------------------------------------------------------------------
 // CTsySatMessaging::NotifyClientAboutCallControlEvent
 (
 TDesC&                  aAlphaId, //Alpha id of call control event
 RSat::TControlResult    aResult
 )
 {
-OstTrace0( TRACE_NORMAL, CTSYSATMESSAGING_NOTIFYCLIENTABOUTCALLCONTROLEVENT, "CTsySatMessaging::NotifyClientAboutCallControlEvent" );
+OstTrace0( TRACE_NORMAL,  CTSYSATMESSAGING_NOTIFYCLIENTABOUTCALLCONTROLEVENT_TD, "CTsySatMessaging::NotifyClientAboutCallControlEvent" );
 iNotifyCallControlRequest->CompleteNotification( aAlphaId, aResult );
 }
 // -----------------------------------------------------------------------------
 // CTsySatMessaging::NotifyClientAboutCallControlEventL
 (
 const TUint8 aCcResult,
 TPtrC8 aEnvelopeResponse
 )
 {
-OstTrace0( TRACE_NORMAL, CTSYSATMESSAGING_NOTIFYCLIENTABOUTCALLCONTROLEVENTL, "CTsySatMessaging::NotifyClientAboutCallControlEventL" );
+OstTrace0( TRACE_NORMAL,  CTSYSATMESSAGING_NOTIFYCLIENTABOUTCALLCONTROLEVENTL_TD, "CTsySatMessaging::NotifyClientAboutCallControlEventL" );
 iNotifyCallControlRequest->CompleteNotificationL( aCcResult, aEnvelopeResponse );
 }
 // -----------------------------------------------------------------------------
 // CTsySatMessaging::NotifyClientAboutGprsCallControlEvent
 (
 const TDesC&                aAlphaId,
 const RSat::TControlResult  aResult
 )
 {
-OstTrace0( TRACE_NORMAL, CTSYSATMESSAGING_NOTIFYCLIENTABOUTGPRSCALLCONTROLEVENT, "CTsySatMessaging::NotifyClientAboutGprsCallControlEvent" );
+OstTrace0( TRACE_NORMAL,  CTSYSATMESSAGING_NOTIFYCLIENTABOUTGPRSCALLCONTROLEVENT_TD, "CTsySatMessaging::NotifyClientAboutGprsCallControlEvent" );
 iNotifyCallControlRequest->CompleteNotification(
 aAlphaId,
 aResult );
 }
 (
 TDesC&                  aAlphaId, //Alpha id of MO-SMS control event
 RSat::TControlResult    aResult
 )
 {
-OstTrace0( TRACE_NORMAL, CTSYSATMESSAGING_NOTIFYCLIENTABOUTMOSMCONTROLEVENT, "CTsySatMessaging::NotifyClientAboutMoSmControlEvent" );
+OstTrace0( TRACE_NORMAL,  CTSYSATMESSAGING_NOTIFYCLIENTABOUTMOSMCONTROLEVENT_TD, "CTsySatMessaging::NotifyClientAboutMoSmControlEvent" );
 iNotifyMoSmControlRequest->CompleteNotification( aAlphaId, aResult );
 }
 // -----------------------------------------------------------------------------
 // CTsySatMessaging::GetTransactionId
 // (other items were commented in a header).
 // -----------------------------------------------------------------------------
 //
 TUint8 CTsySatMessaging::GetTransactionId()
 {
-OstTrace0( TRACE_NORMAL, CTSYSATMESSAGING_GETTRANSACTIONID, "CTsySatMessaging::GetTransactionId" );
+OstTrace0( TRACE_NORMAL,  CTSYSATMESSAGING_GETTRANSACTIONID_TD, "CTsySatMessaging::GetTransactionId" );
 return iTransIdMsg->GetTransactionId( );
 }
 // -----------------------------------------------------------------------------
 // CTsySatMessaging::SatReady
 TInt CTsySatMessaging::SatReady
 (
 TUint8 aMsg // Message to be retrieved
 )
 {
-OstTrace0( TRACE_NORMAL, CTSYSATMESSAGING_SATREADY, "CTsySatMessaging::SatReady" );
+OstTrace0( TRACE_NORMAL,  CTSYSATMESSAGING_SATREADY_TD, "CTsySatMessaging::SatReady" );
 return iPnReceive->SatReady( aMsg );
 }
 // -----------------------------------------------------------------------------
 // CTsySatMessaging::ClearCCArrays
 // (other items were commented in a header).
 // -----------------------------------------------------------------------------
 //
 void CTsySatMessaging::ClearCCArrays()
 {
-OstTrace0( TRACE_NORMAL, CTSYSATMESSAGING_CLEARCCARRAYS, "CTsySatMessaging::ClearCCArrays" );
+OstTrace0( TRACE_NORMAL,  CTSYSATMESSAGING_CLEARCCARRAYS_TD, "CTsySatMessaging::ClearCCArrays" );
 iSatCC->ClearArraysForRefresh();
 }
 // -----------------------------------------------------------------------------
 // CTsySatMessaging::CallControlReceivedL
 void CTsySatMessaging::CallControlReceivedL
 (
 const TIsiReceiveC& aIsiMessage
 )
 {
-OstTrace0( TRACE_NORMAL, CTSYSATMESSAGING_CALLCONTROLRECEIVEDL, "CTsySatMessaging::CallControlReceivedL" );
+OstTrace0( TRACE_NORMAL,  CTSYSATMESSAGING_CALLCONTROLRECEIVEDL_TD, "CTsySatMessaging::CallControlReceivedL" );
 iSatCC->MessageReceivedL( aIsiMessage );
 }
 // -----------------------------------------------------------------------------
 // CTsySatMessaging::DataDownloadReceivedL
 void CTsySatMessaging::DataDownloadReceivedL
 (
 const TIsiReceiveC& aIsiMessage
 )
 {
-OstTrace0( TRACE_NORMAL, CTSYSATMESSAGING_DATADOWNLOADRECEIVEDL, "CTsySatMessaging::DataDownloadReceivedL" );
+OstTrace0( TRACE_NORMAL,  CTSYSATMESSAGING_DATADOWNLOADRECEIVEDL_TD, "CTsySatMessaging::DataDownloadReceivedL" );
 iSatDataDownload->MessageReceivedL( aIsiMessage );
 }
 // -----------------------------------------------------------------------------
 // CTsySatMessaging::MoSmsControlReceivedL
 (
 const TIsiReceiveC& aIsiMessage
 )
 {
 TFLOGSTRING("TSY: CTsySatMessaging::MoSmsControlReceivedL");
-OstTrace0( TRACE_NORMAL, CTSYSATMESSAGING_MOSMSCONTROLRECEIVEDL, "CTsySatMessaging::MoSmsControlReceivedL" );
+OstTrace0( TRACE_NORMAL,  CTSYSATMESSAGING_MOSMSCONTROLRECEIVEDL_TD, "CTsySatMessaging::MoSmsControlReceivedL" );
 if ( iSatMoSmsCtrl->IsActivated() )
 {
 iSatMoSmsCtrl->MessageReceivedL( aIsiMessage );
 }
 }
 // (other items were commented in a header).
 // -----------------------------------------------------------------------------
 //
 TBool CTsySatMessaging::IsMoSmControlBySimActivated()
 {
-OstTrace0( TRACE_NORMAL, CTSYSATMESSAGING_ISMOSMCONTROLBYSIMACTIVATED, "CTsySatMessaging::IsMoSmControlBySimActivated" );
+OstTrace0( TRACE_NORMAL,  CTSYSATMESSAGING_ISMOSMCONTROLBYSIMACTIVATED_TD, "CTsySatMessaging::IsMoSmControlBySimActivated" );
 return iSatMoSmsCtrl->IsActivated();
 }
 // -----------------------------------------------------------------------------
 // CTsySatMessaging::GetSatIcon
 // (other items were commented in a header).
 // -----------------------------------------------------------------------------
 //
 CSatIcon* CTsySatMessaging::GetSatIcon()
 {
-OstTrace0( TRACE_NORMAL, CTSYSATMESSAGING_GETSATICON, "CTsySatMessaging::GetSatIcon" );
+OstTrace0( TRACE_NORMAL,  CTSYSATMESSAGING_GETSATICON_TD, "CTsySatMessaging::GetSatIcon" );
 // Pointer to SAT timer
 return iSatIcon;
 }
 // -----------------------------------------------------------------------------
 void CTsySatMessaging::StoreCallConnectedEvent
 (
 const TDesC8& aEnvelope
 )
 {
-OstTrace0( TRACE_NORMAL, CTSYSATMESSAGING_STORECALLCONNECTEDEVENT, "CTsySatMessaging::StoreCallConnectedEvent" );
+OstTrace0( TRACE_NORMAL,  CTSYSATMESSAGING_STORECALLCONNECTEDEVENT_TD, "CTsySatMessaging::StoreCallConnectedEvent" );
 iNotifySetUpCall->StoreCallConnectedEvent( aEnvelope );
 }
 // -----------------------------------------------------------------------------
 // CTsySatMessaging::SetSetUpCallStatus
 void CTsySatMessaging::SetSetUpCallStatus
 (
 const TBool aStatus
 )
 {
-OstTrace0( TRACE_NORMAL, CTSYSATMESSAGING_SETSETUPCALLSTATUS, "CTsySatMessaging::SetSetUpCallStatus" );
+OstTrace0( TRACE_NORMAL,  CTSYSATMESSAGING_SETSETUPCALLSTATUS_TD, "CTsySatMessaging::SetSetUpCallStatus" );
 iEventDownload->SetSetUpCallStatus( aStatus );
 }
 // -----------------------------------------------------------------------------
 // CTsySatMessaging::SetStatusOfUssdSupport
 void CTsySatMessaging::SetStatusOfUssdSupport
 (
 const TBool aStatus
 )
 {
-OstTrace0( TRACE_NORMAL, CTSYSATMESSAGING_SETSTATUSOFUSSDSUPPORT, "CTsySatMessaging::SetStatusOfUssdSupport" );
+OstTrace0( TRACE_NORMAL,  CTSYSATMESSAGING_SETSTATUSOFUSSDSUPPORT_TD, "CTsySatMessaging::SetStatusOfUssdSupport" );
 iSatCC->SetStatusOfUssdSupport( aStatus );
 }
 // -----------------------------------------------------------------------------
 // CTsySatMessaging::SetTonNpi
 void CTsySatMessaging::SetTonNpi
 (
 const TUint8 aTonNpi
 )
 {
-OstTrace0( TRACE_NORMAL, CTSYSATMESSAGING_SETTONNPI, "CTsySatMessaging::SetTonNpi" );
+OstTrace0( TRACE_NORMAL,  CTSYSATMESSAGING_SETTONNPI_TD, "CTsySatMessaging::SetTonNpi" );
 iSatCC->SetTonNpi( aTonNpi );
 }
 // -----------------------------------------------------------------------------
 // CTsySatMessaging::StoreSms
 TInt CTsySatMessaging::StoreSmsL
 (
 RMobileSmsStore::TMobileGsmSmsEntryV1& aSmsEntry
 )
 {
-OstTrace0( TRACE_NORMAL, CTSYSATMESSAGING_STORESMSL, "CTsySatMessaging::StoreSmsL" );
+OstTrace0( TRACE_NORMAL,  CTSYSATMESSAGING_STORESMSL_TD, "CTsySatMessaging::StoreSmsL" );
 #if ( NCP_COMMON_S60_VERSION_SUPPORT == S60_VERSION_32 )
 RMobileSmsStore::TMobileGsmSmsEntryV1Pckg smsPckg( aSmsEntry );
 // Pack data and forward request to DOS
 TDesC8* data = reinterpret_cast<TDesC8*>( &smsPckg );
 // (other items were commented in a header).
 // -----------------------------------------------------------------------------
 //
 void CTsySatMessaging::UsatClientReadyIndication( TTsyReqHandle aTsyReqHandle )
 {
-OstTrace0( TRACE_NORMAL, CTSYSATMESSAGING_USATCLIENTREADYINDICATION, "CTsySatMessaging::UsatClientReadyIndication" );
+OstTrace0( TRACE_NORMAL,  CTSYSATMESSAGING_USATCLIENTREADYINDICATION_TD, "CTsySatMessaging::UsatClientReadyIndication" );
 TFLOGSTRING("TSY: CTsySatMessaging::UsatClientReadyIndication");
 // Set SAT ready flag in satmesshandler
 iSatMessHandler->SetSatReadyStatus( ETrue );
 // (other items were commented in a header)
 // -----------------------------------------------------------------------------
 //
 CMmMessageRouter* CTsySatMessaging::GetMessageRouter()
 {
-OstTrace0( TRACE_NORMAL, CTSYSATMESSAGING_GETMESSAGEROUTER, "CTsySatMessaging::GetMessageRouter" );
+OstTrace0( TRACE_NORMAL,  CTSYSATMESSAGING_GETMESSAGEROUTER_TD, "CTsySatMessaging::GetMessageRouter" );
 return iRouter;
 }
 #endif
 // ================= OTHER EXPORTED FUNCTIONS ==================================

changeset 9	8486d82aef45
parent 8	6295dc2169f3