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

equal deleted inserted replaced

-:6295dc2169f3
+:8486d82aef45
 {
 if ( ( firstTime ) &&
 ( ( i + 1 ) == length ) ) // All bytes collected and traced
 {
 firstTime = EFalse;
-OstTraceExt1( TRACE_NORMAL, _TFLOG_PRINT_ISIMESSAGE, "Phonet Sender: [ %s]", trace_msg );
+OstTraceExt1( TRACE_NORMAL,  _TFLOG_PRINT_ISIMESSAGE_TD, "Phonet Sender: [ %s]", trace_msg );
 trace_msg.SetLength( 0 );
 }
 else if ( firstTime ) // 1st line of the trace
 {
 firstTime = EFalse;
-OstTraceExt1( TRACE_NORMAL, DUP1__TFLOG_PRINT_ISIMESSAGE, "Phonet Sender: [ %s", trace_msg );
+OstTraceExt1( TRACE_NORMAL,  DUP1__TFLOG_PRINT_ISIMESSAGE_TD, "Phonet Sender: [ %s", trace_msg );
 trace_msg.SetLength( 0 );
 }
 else if ( ( i + 1 ) == length ) // The last line
 {
-OstTraceExt1( TRACE_NORMAL, DUP4__TFLOG_PRINT_ISIMESSAGE, "Phonet Sender:   %s]", trace_msg );
+OstTraceExt1( TRACE_NORMAL,  DUP4__TFLOG_PRINT_ISIMESSAGE_TD, "Phonet Sender:   %s]", trace_msg );
 trace_msg.SetLength( 0 );
 }
 else // just print bytes
 {
-OstTraceExt1( TRACE_NORMAL, DUP5__TFLOG_PRINT_ISIMESSAGE, "Phonet Sender:   %s", trace_msg );
+OstTraceExt1( TRACE_NORMAL,  DUP5__TFLOG_PRINT_ISIMESSAGE_TD, "Phonet Sender:   %s", trace_msg );
 trace_msg.SetLength( 0 );
 }
 counter = 0;
 }
 counter++;
 CMmPhoNetSender::CMmPhoNetSender()
 :iSendBuffer( NULL ),
 iSendBufferPtr( 0,0 )
 {
 TFLOGSTRING("TSY: CMmPhoNetSender::CMmPhoNetSender");
-OstTrace0( TRACE_NORMAL, CMMPHONETSENDER_CMMPHONETSENDER, "CMmPhoNetSender::CMmPhoNetSender" );
+OstTrace0( TRACE_NORMAL,  CMMPHONETSENDER_CMMPHONETSENDER_TD, "CMmPhoNetSender::CMmPhoNetSender" );
 }
 // -----------------------------------------------------------------------------
 // CMmPhoNetSender::~CMmPhoNetSender
 // Destructor, deletes all allocated resources.
 // -----------------------------------------------------------------------------
 //
 CMmPhoNetSender::~CMmPhoNetSender()
 {
 TFLOGSTRING("TSY: CMmPhoNetSender::~CMmPhoNetSender");
-OstTrace0( TRACE_NORMAL, DUP1_CMMPHONETSENDER_CMMPHONETSENDER, "CMmPhoNetSender::~CMmPhoNetSender" );
+OstTrace0( TRACE_NORMAL,  DUP1_CMMPHONETSENDER_CMMPHONETSENDER_TD, "CMmPhoNetSender::~CMmPhoNetSender" );
 delete iSendBuffer;
 }
 // -----------------------------------------------------------------------------
 // CMmPhoNetSender::NewL
 (
 RIscApi* aPn // Pointer to the IscApi
 )
 {
 TFLOGSTRING("TSY: CMmPhoNetSender::NewL");
-OstTrace0( TRACE_NORMAL, CMMPHONETSENDER_NEWL, "CMmPhoNetSender::NewL" );
+OstTrace0( TRACE_NORMAL,  CMMPHONETSENDER_NEWL_TD, "CMmPhoNetSender::NewL" );
 CMmPhoNetSender* phoNetSender = NULL;
 if ( NULL != aPn )
 {
 // -----------------------------------------------------------------------------
 //
 void CMmPhoNetSender::ConstructL()
 {
 TFLOGSTRING("TSY: CMmPhoNetSender::ConstructL");
-OstTrace0( TRACE_NORMAL, CMMPHONETSENDER_CONSTRUCTL, "CMmPhoNetSender::ConstructL" );
+OstTrace0( TRACE_NORMAL,  CMMPHONETSENDER_CONSTRUCTL_TD, "CMmPhoNetSender::ConstructL" );
 iSendBuffer = HBufC8::NewL( KMaxSendBufferSize );
 iSendBufferPtr.Set( iSendBuffer->Des() );
 TFLOGSTRING2("TSY: iSendBuffer len=%d", iSendBuffer->Length());
-OstTrace1( TRACE_NORMAL, DUP1_CMMPHONETSENDER_CONSTRUCTL, "CMmPhoNetSender::ConstructL;iSendBuffer->Length=%d", iSendBuffer->Length() );
+OstTrace1( TRACE_NORMAL,  DUP1_CMMPHONETSENDER_CONSTRUCTL_TD, "CMmPhoNetSender::ConstructL;iSendBuffer->Length=%d", iSendBuffer->Length() );
 TFLOGSTRING3("TSY: iSendBufferPtr len=%d maxlen=%d",
 iSendBufferPtr.Length(),
 iSendBufferPtr.MaxLength());
-OstTrace1( TRACE_NORMAL, DUP2_CMMPHONETSENDER_CONSTRUCTL, "CMmPhoNetSender::ConstructL;iSendBufferPtr.MaxLength=%d", iSendBufferPtr.MaxLength() );
+OstTrace1( TRACE_NORMAL,  DUP2_CMMPHONETSENDER_CONSTRUCTL_TD, "CMmPhoNetSender::ConstructL;iSendBufferPtr.MaxLength=%d", iSendBufferPtr.MaxLength() );
 }
 // -----------------------------------------------------------------------------
 // CMmPhoNetSender::SendBufferDes
 // Description: Returns pointer to buffer for ISI message construction
 // (other items were commented in a header).
 // -----------------------------------------------------------------------------
 //
 TDes8& CMmPhoNetSender::SendBufferDes()
 {
-OstTrace0( TRACE_NORMAL, CMMPHONETSENDER_SENDBUFFERDES, "CMmPhoNetSender::SendBufferDes" );
+OstTrace0( TRACE_NORMAL,  CMMPHONETSENDER_SENDBUFFERDES_TD, "CMmPhoNetSender::SendBufferDes" );
 return iSendBufferPtr;
 }
 // -----------------------------------------------------------------------------
 // CMmPhoNetSender::Send
 (
 const TDesC8& aMsg // ISI message to be sent to Phonet
 )
 {
 TFLOGSTRING("TSY: CMmPhoNetSender::Send");
-OstTrace0( TRACE_NORMAL, CMMPHONETSENDER_SEND, "CMmPhoNetSender::Send" );
+OstTrace0( TRACE_NORMAL,  CMMPHONETSENDER_SEND_TD, "CMmPhoNetSender::Send" );
 TInt ret( KErrServerBusy );
 ret = iPhoNet->Send( aMsg );
 TInt aMessageId, // ISI message ID
 const TDesC8& aData // Data part of ISI message
 )
 {
 TFLOGSTRING("TSY: CMmPhoNetSender::Send (resource+transaction+data)");
-OstTrace0( TRACE_NORMAL, DUP1_CMMPHONETSENDER_SEND, "CMmPhoNetSender::Send (resource+transaction+data)" );
+OstTrace0( TRACE_NORMAL,  DUP1_CMMPHONETSENDER_SEND_TD, "CMmPhoNetSender::Send (resource+transaction+data)" );
 // We shall use send buffer
 TDes8& buffer( SendBufferDes() );
 buffer.Zero();
 const TInt header_size( 10 ); // Header + transaction id + message id
 (
 const TDesC8& aEvent
 )
 {
 TFLOGSTRING("TSY: CMmPhoNetSender::EventSend");
-OstTrace0( TRACE_NORMAL, CMMPHONETSENDER_EVENTSEND, "CMmPhoNetSender::EventSend" );
+OstTrace0( TRACE_NORMAL,  CMMPHONETSENDER_EVENTSEND_TD, "CMmPhoNetSender::EventSend" );
 return iPhoNet->CustomFunction( EIscNokiaEventSend, (TDes8*)&aEvent );
 }
 // -----------------------------------------------------------------------------
 (
 const TDesC8& aEvents // Events to be subscribed
 )
 {
 TFLOGSTRING("TSY: CMmPhoNetSender::SubscribeEvents");
-OstTrace0( TRACE_NORMAL, CMMPHONETSENDER_SUBSCRIBEEVENTS, "CMmPhoNetSender::SubscribeEvents" );
+OstTrace0( TRACE_NORMAL,  CMMPHONETSENDER_SUBSCRIBEEVENTS_TD, "CMmPhoNetSender::SubscribeEvents" );
 return iPhoNet->CustomFunction( EIscNokiaEventSubscribe, (TDes8*)&aEvents );
 }
 // -----------------------------------------------------------------------------
 const TUint16 aChannel,
 TDes8& aInfo
 )
 {
 TFLOGSTRING("TSY: CMmPhoNetSender::GetChannelInfo");
-OstTrace0( TRACE_NORMAL, CMMPHONETSENDER_GETCHANNELINFO, "CMmPhoNetSender::GetChannelInfo" );
+OstTrace0( TRACE_NORMAL,  CMMPHONETSENDER_GETCHANNELINFO_TD, "CMmPhoNetSender::GetChannelInfo" );
 return iPhoNet->GetChannelInfo( aChannel, aInfo );
 }
 // ==================== OTHER EXPORTED FUNCTIONS ===============================

changeset 9	8486d82aef45
parent 5	8ccc39f9d787