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

equal deleted inserted replaced

-:6295dc2169f3
+:8486d82aef45
 //
 CMmPacketServiceMessHandler::CMmPacketServiceMessHandler()
 {
 TFLOGSTRING("TSY: CMmPacketServiceMessHandler::C++ constructor");
-OstTrace0( TRACE_NORMAL, CMMPACKETSERVICEMESSHANDLER_CMMPACKETSERVICEMESSHANDLER, "CMmPacketServiceMessHandler::CMmPacketServiceMessHandler" );
+OstTrace0( TRACE_NORMAL,  CMMPACKETSERVICEMESSHANDLER_CMMPACKETSERVICEMESSHANDLER_TD, "CMmPacketServiceMessHandler::CMmPacketServiceMessHandler" );
 }
 // -----------------------------------------------------------------------------
 // CMmPacketServiceMessHandler::~CMmPacketServiceMessHandler
 // Destructor, deletes all allocated resources.
 //
 CMmPacketServiceMessHandler::~CMmPacketServiceMessHandler()
 {
 TFLOGSTRING("TSY: CMmPacketServiceMessHandler::~CMmPacketServiceMessHandler.\n" );
-OstTrace0( TRACE_NORMAL, DUP1_CMMPACKETSERVICEMESSHANDLER_CMMPACKETSERVICEMESSHANDLER, "CMmPacketServiceMessHandler::~CMmPacketServiceMessHandler" );
+OstTrace0( TRACE_NORMAL,  DUP1_CMMPACKETSERVICEMESSHANDLER_CMMPACKETSERVICEMESSHANDLER_TD, "CMmPacketServiceMessHandler::~CMmPacketServiceMessHandler" );
 // Delete iPacketMesshandlerContextList object
 if ( iPacketMesshandlerContextList )
 {
 delete iPacketMesshandlerContextList;
 CMmPhoNetSender* aPhoNetSender,
 CMmPhoNetReceiver* aPhoNetReceiver,
 CMmMessageRouter* aMessageRouter )
 {
 TFLOGSTRING("TSY: CMmPacketServiceMessHandler::NewL" );
-OstTrace0( TRACE_NORMAL, CMMPACKETSERVICEMESSHANDLER_NEWL, "CMmPacketServiceMessHandler::NewL" );
+OstTrace0( TRACE_NORMAL,  CMMPACKETSERVICEMESSHANDLER_NEWL_TD, "CMmPacketServiceMessHandler::NewL" );
 CMmPacketServiceMessHandler* packetServiceMessHandler =
 new( ELeave ) CMmPacketServiceMessHandler();
 CleanupStack::PushL( packetServiceMessHandler );
 //
 void CMmPacketServiceMessHandler::ConstructL()
 {
 TFLOGSTRING("TSY: CMmPacketServiceMessHandler::ConstructL");
-OstTrace0( TRACE_NORMAL, CMMPACKETSERVICEMESSHANDLER_CONSTRUCTL, "CMmPacketServiceMessHandler::ConstructL" );
+OstTrace0( TRACE_NORMAL,  CMMPACKETSERVICEMESSHANDLER_CONSTRUCTL_TD, "CMmPacketServiceMessHandler::ConstructL" );
 iAlwaysOnMode = RMmCustomAPI::EAlwaysModeNeither;
 iPacketMesshandlerContextList = CMmPacketContextMesshandlerList::NewL();
 }
 TInt aIpc,
 const CMmDataPackage* aDataPackage )
 {
 TFLOGSTRING2("TSY: CMmPacketServiceMessHandler::ExtFuncL. IPC: %d", aIpc );
-OstTrace1( TRACE_NORMAL, CMMPACKETSERVICEMESSHANDLER_EXTFUNCL, "CMmPacketServiceMessHandler::ExtFuncL;aIpc=%d", aIpc );
+OstTrace1( TRACE_NORMAL,  CMMPACKETSERVICEMESSHANDLER_EXTFUNCL_TD, "CMmPacketServiceMessHandler::ExtFuncL;aIpc=%d", aIpc );
 TInt ret( KErrNotSupported );
 CMmDataPackage dataPackage;
 switch ( aIpc )
 }
 default:
 {
 TFLOGSTRING2("TSY: CMmPacketServiceMessHandler::ExtFuncL - Unknown IPC: %d",  aIpc);
-OstTrace1( TRACE_NORMAL, DUP1_CMMPACKETSERVICEMESSHANDLER_EXTFUNCL, "CMmPacketServiceMessHandler::ExtFuncL;Unknown aIpc=%d", aIpc );
+OstTrace1( TRACE_NORMAL,  DUP1_CMMPACKETSERVICEMESSHANDLER_EXTFUNCL_TD, "CMmPacketServiceMessHandler::ExtFuncL;Unknown aIpc=%d", aIpc );
 break;
 }
 }
 return ret;
 {
 TInt resource( aIsiMessage.Get8bit( ISI_HEADER_OFFSET_RESOURCEID ) );
 TInt messageId( aIsiMessage.Get8bit( ISI_HEADER_OFFSET_MESSAGEID ) );
 TFLOGSTRING3("TSY: CMmPacketServiceMessHandler::ReceiveMessageL. resource:%d, msgId:%d", resource, messageId);
-OstTraceExt2( TRACE_NORMAL, CMMPACKETSERVICEMESSHANDLER_RECEIVEMESSAGEL, "CMmPacketServiceMessHandler::ReceiveMessageL;resource=%d;messageId=%d", resource, messageId );
+OstTraceExt2( TRACE_NORMAL,  CMMPACKETSERVICEMESSHANDLER_RECEIVEMESSAGEL_TD, "CMmPacketServiceMessHandler::ReceiveMessageL;resource=%d;messageId=%d", resource, messageId );
 switch ( resource )
 {
 case PN_MODEM_NETWORK:
 {
 break;
 }
 default:
 {
 TFLOGSTRING("TSY: CMmPacketServiceMessHandler::ReceiveMessageL. default in case PN_MODEM_NETWORK");
-OstTrace0( TRACE_NORMAL, DUP1_CMMPACKETSERVICEMESSHANDLER_RECEIVEMESSAGEL, "CMmPacketServiceMessHandler::ReceiveMessageL, default in case PN_MODEM_NETWORK" );
+OstTrace0( TRACE_NORMAL,  DUP1_CMMPACKETSERVICEMESSHANDLER_RECEIVEMESSAGEL_TD, "CMmPacketServiceMessHandler::ReceiveMessageL, default in case PN_MODEM_NETWORK" );
 break;
 }
 }
 break;
 }
 break;
 }
 default:
 {
 TFLOGSTRING("TSY: CMmPacketServiceMessHandler::SpecificPacketServiceMessageReceived: KErrNotFound");
-OstTrace0( TRACE_NORMAL, DUP2_CMMPACKETSERVICEMESSHANDLER_RECEIVEMESSAGEL, "CMmPacketServiceMessHandler::ReceiveMessageL, KErrNotFound" );
+OstTrace0( TRACE_NORMAL,  DUP2_CMMPACKETSERVICEMESSHANDLER_RECEIVEMESSAGEL_TD, "CMmPacketServiceMessHandler::ReceiveMessageL, KErrNotFound" );
 break;
 }
 }
 break;
 }
 default:
 {
 // No appropriate handler methods for ISI-message found.
 TFLOGSTRING("TSY: CMmPacketServiceMessHandler::SpecificPacketServiceMessageReceived no handler for the message id");
-OstTrace0( TRACE_NORMAL, DUP3_CMMPACKETSERVICEMESSHANDLER_RECEIVEMESSAGEL, "CMmPacketServiceMessHandler::ReceiveMessageL, SpecificPacketServiceMessageReceived no handler for the message id" );
+OstTrace0( TRACE_NORMAL,  DUP3_CMMPACKETSERVICEMESSHANDLER_RECEIVEMESSAGEL_TD, "CMmPacketServiceMessHandler::ReceiveMessageL, SpecificPacketServiceMessageReceived no handler for the message id" );
 // server not known
 break;
 }
 }
 }
 //
 TInt CMmPacketServiceMessHandler::GpdsStatusReq() const
 {
 TFLOGSTRING("TSY: CMmPacketServiceMessHandler::GpdsStatusReq.\n" );
-OstTrace0( TRACE_NORMAL, CMMPACKETSERVICEMESSHANDLER_GPDSSTATUSREQ, "CMmPacketServiceMessHandler::GpdsStatusReq" );
+OstTrace0( TRACE_NORMAL,  CMMPACKETSERVICEMESSHANDLER_GPDSSTATUSREQ_TD, "CMmPacketServiceMessHandler::GpdsStatusReq" );
 // Append data for ISI message
 TBuf8<KBuffSizeOneByte> data;
 // Message sent via Phonet
 void CMmPacketServiceMessHandler::GpdsStatusResp(
 const TIsiReceiveC& aIsiMessage )
 {
 TFLOGSTRING("TSY: CMmPacketServiceMessHandler::GpdsStatusResp.\n" );
-OstTrace0( TRACE_NORMAL, CMMPACKETSERVICEMESSHANDLER_GPDSSTATUSRESP, "CMmPacketServiceMessHandler::GpdsStatusResp" );
+OstTrace0( TRACE_NORMAL,  CMMPACKETSERVICEMESSHANDLER_GPDSSTATUSRESP_TD, "CMmPacketServiceMessHandler::GpdsStatusResp" );
 const TUint8 attachStatus( aIsiMessage.Get8bit(
 ISI_HEADER_SIZE + GPDS_STATUS_RESP_OFFSET_ATTACHSTATUS ) );
 const TUint8 transfStatus( aIsiMessage.Get8bit(
 ISI_HEADER_SIZE + GPDS_STATUS_RESP_OFFSET_TRANSFERSTATUS ) );
 TFLOGSTRING3("TSY: CMmPacketServiceMessHandler::GpdsStatusResp.\n  \t Attach Status:%d\n\t Transfer Status:%d\n", attachStatus, transfStatus );
-OstTraceExt2( TRACE_NORMAL, DUP1_CMMPACKETSERVICEMESSHANDLER_GPDSSTATUSRESP, "CMmPacketServiceMessHandler::GpdsStatusResp;attachStatus=%hhu;transfStatus=%hhu", attachStatus, transfStatus );
+OstTraceExt2( TRACE_NORMAL,  DUP1_CMMPACKETSERVICEMESSHANDLER_GPDSSTATUSRESP_TD, "CMmPacketServiceMessHandler::GpdsStatusResp;attachStatus=%hhu;transfStatus=%hhu", attachStatus, transfStatus );
 CompleteGpdsStatusRequest( attachStatus, transfStatus );
 }
 // ----------------------------------------------------------------------------
 //
 TInt CMmPacketServiceMessHandler::GpdsAttachReq() const
 {
 TFLOGSTRING("TSY: CMmPacketServiceMessHandler::GpdsAttachReq.\n" );
-OstTrace0( TRACE_NORMAL, CMMPACKETSERVICEMESSHANDLER_GPDSATTACHREQ, "CMmPacketServiceMessHandler::GpdsAttachReq" );
+OstTrace0( TRACE_NORMAL,  CMMPACKETSERVICEMESSHANDLER_GPDSATTACHREQ_TD, "CMmPacketServiceMessHandler::GpdsAttachReq" );
 // Append data for ISI message
 TBuf8<1> data;
 data.Append( GPDS_FOLLOW_OFF );
 void CMmPacketServiceMessHandler::GpdsAttachResp(
 const TIsiReceiveC& aIsiMessage ) const
 {
 TFLOGSTRING("TSY: CMmPacketServiceMessHandler::GpdsAttachResp.\n" );
-OstTrace0( TRACE_NORMAL, CMMPACKETSERVICEMESSHANDLER_GPDSATTACHRESP, "CMmPacketServiceMessHandler::GpdsAttachResp" );
+OstTrace0( TRACE_NORMAL,  CMMPACKETSERVICEMESSHANDLER_GPDSATTACHRESP_TD, "CMmPacketServiceMessHandler::GpdsAttachResp" );
 if ( GPDS_ATTACH_REQ == aIsiMessage.Get8bit(
 ISI_HEADER_SIZE + GPDS_ATTACH_RESP_OFFSET_UTID ) )
 {
 const TUint8 status( aIsiMessage.Get8bit(
 cause );
 }
 //no else
 TFLOGSTRING3("TSY: CMmPacketServiceMessHandler::GpdsAttachResp.\n  \t Status:%d\n\t Cause:%d\n", status, cause );
-OstTraceExt2( TRACE_NORMAL, DUP1_CMMPACKETSERVICEMESSHANDLER_GPDSATTACHRESP, "CMmPacketServiceMessHandler::GpdsAttachResp;status=%hhu;cause=%hhu", status, cause );
+OstTraceExt2( TRACE_NORMAL,  DUP1_CMMPACKETSERVICEMESSHANDLER_GPDSATTACHRESP_TD, "CMmPacketServiceMessHandler::GpdsAttachResp;status=%hhu;cause=%hhu", status, cause );
 //Complete Attach
 iMessageRouter->Complete(
 EPacketAttach,
 errorValue );
 //
 void CMmPacketServiceMessHandler::GpdsAttachInd() const
 {
 TFLOGSTRING("TSY: CMmPacketServiceMessHandler::GpdsAttachInd.\n" );
-OstTrace0( TRACE_NORMAL, CMMPACKETSERVICEMESSHANDLER_GPDSATTACHIND, "CMmPacketServiceMessHandler::GpdsAttachInd" );
+OstTrace0( TRACE_NORMAL,  CMMPACKETSERVICEMESSHANDLER_GPDSATTACHIND_TD, "CMmPacketServiceMessHandler::GpdsAttachInd" );
 RPacketService::TStatus status( RPacketService::EStatusAttached );
 TBool isResumed( EFalse );
 CMmDataPackage data;
 //
 TInt CMmPacketServiceMessHandler::GpdsDetachReq() const
 {
 TFLOGSTRING("TSY: CMmPacketServiceMessHandler::GpdsDetachReq.\n" );
-OstTrace0( TRACE_NORMAL, CMMPACKETSERVICEMESSHANDLER_GPDSDETACHREQ, "CMmPacketServiceMessHandler::GpdsDetachReq" );
+OstTrace0( TRACE_NORMAL,  CMMPACKETSERVICEMESSHANDLER_GPDSDETACHREQ_TD, "CMmPacketServiceMessHandler::GpdsDetachReq" );
 // Create isi message
 TBuf8<SIZE_GPDS_DETACH_REQ + SIZE_GPDS_CONDITIONAL_DETACH_INFO>
 messageData;
 void CMmPacketServiceMessHandler::GpdsDetachResp(
 const TIsiReceiveC& aIsiMessage ) const
 {
 TFLOGSTRING("TSY: CMmPacketServiceMessHandler::GpdsDetachResp.\n" );
-OstTrace0( TRACE_NORMAL, CMMPACKETSERVICEMESSHANDLER_GPDSDETACHRESP, "CMmPacketServiceMessHandler::GpdsDetachResp" );
+OstTrace0( TRACE_NORMAL,  CMMPACKETSERVICEMESSHANDLER_GPDSDETACHRESP_TD, "CMmPacketServiceMessHandler::GpdsDetachResp" );
 if ( GPDS_DETACH_REQ == aIsiMessage.Get8bit(
 ISI_HEADER_SIZE +  GPDS_DETACH_RESP_OFFSET_UTID ) )
 {
 TInt errorValue( KErrNone );
 errorValue = CMmStaticUtility::EpocErrorCode(
 KErrGeneral, KErrGsmMMNetworkFailure );
 }
 TFLOGSTRING2("TSY: CMmPacketServiceMessHandler::GpdsDetachResp.\n\t Status:%d\n", status );
-OstTraceExt1( TRACE_NORMAL, DUP1_CMMPACKETSERVICEMESSHANDLER_GPDSDETACHRESP, "CMmPacketServiceMessHandler::GpdsDetachResp;status=%hhu", status );
+OstTraceExt1( TRACE_NORMAL,  DUP1_CMMPACKETSERVICEMESSHANDLER_GPDSDETACHRESP_TD, "CMmPacketServiceMessHandler::GpdsDetachResp;status=%hhu", status );
 //Complete
 iMessageRouter->Complete(
 EPacketDetach,
 errorValue );
 CMmDataPackage data;
 data.PackData( &status, &isResumed );
 TFLOGSTRING2("TSY: CMmPacketServiceMessHandler::GpdsDetachInd. Complete\n\t status:%d\n", status );
-OstTraceExt1( TRACE_NORMAL, CMMPACKETSERVICEMESSHANDLER_GPDSDETACHIND, "CMmPacketServiceMessHandler::GpdsDetachInd;status=%hhu", status );
+OstTraceExt1( TRACE_NORMAL,  CMMPACKETSERVICEMESSHANDLER_GPDSDETACHIND_TD, "CMmPacketServiceMessHandler::GpdsDetachInd;status=%hhu", status );
 iMessageRouter->Complete(
 EPacketNotifyStatusChange,
 &data,
 KErrNone );
 }
 // ----------------------------------------------------------------------------
 //
 TInt CMmPacketServiceMessHandler::NetModemRegStatusGetReq() const
 {
 TFLOGSTRING("TSY: CMmPacketServiceMessHandler::NetModemRegStatusGetReq" );
-OstTrace0( TRACE_NORMAL, CMMPACKETSERVICEMESSHANDLER_NETMODEMREGSTATUSGETREQ, "CMmPacketServiceMessHandler::NetModemRegStatusGetReq" );
+OstTrace0( TRACE_NORMAL,  CMMPACKETSERVICEMESSHANDLER_NETMODEMREGSTATUSGETREQ_TD, "CMmPacketServiceMessHandler::NetModemRegStatusGetReq" );
 // Data buffer for transactionId and Message Id.
 TBuf8<2> data;
 data.Append( NET_MODEM_REG_STATUS_GET_REQ );
 data.Append( NET_MODEM_REG_STATUS_GET_REQ );
 // ----------------------------------------------------------------------------
 void CMmPacketServiceMessHandler::NetModemRegStatusGetRespOrInd(
 const TIsiReceiveC &aIsiMessage )
 {
 TFLOGSTRING("TSY: CMmPacketServiceMessHandler::NetModemRegStatusGetRespOrInd");
-OstTrace0( TRACE_NORMAL, CMMPACKETSERVICEMESSHANDLER_NETMODEMREGSTATUSGETRESPORIND, "CMmPacketServiceMessHandler::NetModemRegStatusGetRespOrInd" );
+OstTrace0( TRACE_NORMAL,  CMMPACKETSERVICEMESSHANDLER_NETMODEMREGSTATUSGETRESPORIND_TD, "CMmPacketServiceMessHandler::NetModemRegStatusGetRespOrInd" );
 TUint sbStartOffSet( 0 );
 TInt ret( 0 );
 TBool isNetModemRegStatusInd( NET_MODEM_REG_STATUS_IND ==
 aIsiMessage.Get8bit( ISI_HEADER_OFFSET_MESSAGEID ) );
 const TUint8 successCode( aIsiMessage.Get8bit(
 ISI_HEADER_SIZE +
 NET_MODEM_REG_STATUS_GET_RESP_OFFSET_SUCCESSCODE ) );
 TFLOGSTRING3("TSY: CMmPacketServiceMessHandler::NetModemRegStatusGetRespOrInd - NetModemRegStatusGetResp, Registration Status:%d Success Code:%d", regStatus, successCode);
-OstTraceExt2( TRACE_NORMAL, DUP1_CMMPACKETSERVICEMESSHANDLER_NETMODEMREGSTATUSGETRESPORIND, "CMmPacketServiceMessHandler::NetModemRegStatusGetRespOrInd - NetModemRegStatusGetResp, Registration Status=%hhu Success Code=%hhu", regStatus, successCode );
+OstTraceExt2( TRACE_NORMAL,  DUP1_CMMPACKETSERVICEMESSHANDLER_NETMODEMREGSTATUSGETRESPORIND_TD, "CMmPacketServiceMessHandler::NetModemRegStatusGetRespOrInd - NetModemRegStatusGetResp, Registration Status=%hhu Success Code=%hhu", regStatus, successCode );
 // Map registration status mapping
 RPacketService::TRegistrationStatus regStatusClient(
 MapNtwkRegStatus( regStatus, successCode ) );
 KErrNone );
 }
 else
 {
 TFLOGSTRING2("TSY: CMmPacketServiceMessHandler::NetModemRegStatusGetRespOrInd - NetModemRegStatusInd, Registration Status:%d", regStatus);
-OstTraceExt1( TRACE_NORMAL, DUP2_CMMPACKETSERVICEMESSHANDLER_NETMODEMREGSTATUSGETRESPORIND, "CMmPacketServiceMessHandler::NetModemRegStatusGetRespOrInd - NetModemRegStatusInd, Registration Status=%hhu", regStatus );
+OstTraceExt1( TRACE_NORMAL,  DUP2_CMMPACKETSERVICEMESSHANDLER_NETMODEMREGSTATUSGETRESPORIND_TD, "CMmPacketServiceMessHandler::NetModemRegStatusGetRespOrInd - NetModemRegStatusInd, Registration Status=%hhu", regStatus );
 CMmDataPackage data;
 // Map Status
 RPacketService::TRegistrationStatus regstatus(
 iLastDtmSupportInCell = dtmSupportInCell;
 TFLOGSTRING3("TSY: CMmPacketServiceMessHandler::NetModemRegStatusGetRespOrInd - CS Services:%d GPRS support in cell:%d", csServices, gprsSupported);
 TFLOGSTRING2("TSY: CMmPacketServiceMessHandler::NetModemRegStatusGetRespOrInd - EdgeGprsSupport:%d", edgeGprsSupport);
 TFLOGSTRING2("TSY: CMmPacketServiceMessHandler::NetModemRegStatusGetRespOrInd - DtmSupport:%d", dtmSupportInCell);
-OstTraceExt2( TRACE_NORMAL, DUP3_CMMPACKETSERVICEMESSHANDLER_NETMODEMREGSTATUSGETRESPORIND, "CMmPacketServiceMessHandler::NetModemRegStatusGetRespOrInd - CS Services=%hhu GPRS support in cell=%hhu", csServices, gprsSupported );
+OstTraceExt2( TRACE_NORMAL,  DUP3_CMMPACKETSERVICEMESSHANDLER_NETMODEMREGSTATUSGETRESPORIND_TD, "CMmPacketServiceMessHandler::NetModemRegStatusGetRespOrInd - CS Services=%hhu GPRS support in cell=%hhu", csServices, gprsSupported );
-OstTraceExt1( TRACE_NORMAL, DUP4_CMMPACKETSERVICEMESSHANDLER_NETMODEMREGSTATUSGETRESPORIND, "CMmPacketServiceMessHandler::NetModemRegStatusGetRespOrInd - EdgeGprsSupport=%hhu", edgeGprsSupport );
+OstTraceExt1( TRACE_NORMAL,  DUP4_CMMPACKETSERVICEMESSHANDLER_NETMODEMREGSTATUSGETRESPORIND_TD, "CMmPacketServiceMessHandler::NetModemRegStatusGetRespOrInd - EdgeGprsSupport=%hhu", edgeGprsSupport );
-OstTraceExt1( TRACE_NORMAL, DUP5_CMMPACKETSERVICEMESSHANDLER_NETMODEMREGSTATUSGETRESPORIND, "CMmPacketServiceMessHandler::NetModemRegStatusGetRespOrInd - DtmSupport=%hhu", dtmSupportInCell );
+OstTraceExt1( TRACE_NORMAL,  DUP5_CMMPACKETSERVICEMESSHANDLER_NETMODEMREGSTATUSGETRESPORIND_TD, "CMmPacketServiceMessHandler::NetModemRegStatusGetRespOrInd - DtmSupport=%hhu", dtmSupportInCell );
 // Complete notification to the active extension
 CompleteGsmRegistrationInfo(
 csServices,
 gprsSupported,
 const TUint8 aClassCMode,
 RMmCustomAPI::TSetAlwaysOnMode alwaysOnMode )
 {
 TFLOGSTRING2("TSY: CMmPacketServiceMessHandler::GpdsConfigureReq.\n\t Attach Mode:%d\n", aAttachMode );
-OstTraceExt1( TRACE_NORMAL, CMMPACKETSERVICEMESSHANDLER_GPDSCONFIGUREREQ, "CMmPacketServiceMessHandler::GpdsConfigureReq;aAttachMode=%hhu", aAttachMode );
+OstTraceExt1( TRACE_NORMAL,  CMMPACKETSERVICEMESSHANDLER_GPDSCONFIGUREREQ_TD, "CMmPacketServiceMessHandler::GpdsConfigureReq;aAttachMode=%hhu", aAttachMode );
 TUint8 aAolContext = GPDS_AOL_CTX_NOT_ACTIVE;
 iAlwaysOnMode = alwaysOnMode;
 TFLOGSTRING3("TSY: CMmPacketServiceMessHandler::GpdsConfigureReq.\n  \t Mt Context Activation Mode:%d\n\t Class C Mode:%d\n", aMtContextActivationMode, aClassCMode );
-OstTraceExt2( TRACE_NORMAL, DUP1_CMMPACKETSERVICEMESSHANDLER_GPDSCONFIGUREREQ, "CMmPacketServiceMessHandler::GpdsConfigureReq;aMtContextActivationMode=%hhu;aClassCMode=%hhu", aMtContextActivationMode, aClassCMode );
+OstTraceExt2( TRACE_NORMAL,  DUP1_CMMPACKETSERVICEMESSHANDLER_GPDSCONFIGUREREQ_TD, "CMmPacketServiceMessHandler::GpdsConfigureReq;aMtContextActivationMode=%hhu;aClassCMode=%hhu", aMtContextActivationMode, aClassCMode );
 switch ( iAlwaysOnMode )
 {
 case RMmCustomAPI::EAlwaysModeHPLMN :
 {
 }
 default:
 {
 TFLOGSTRING2("CMmPacketServiceMessHandler::GpdsConfigureReq.\n\t AOL Context Mode:%d\n", aAolContext);
-OstTraceExt1( TRACE_NORMAL, DUP2_CMMPACKETSERVICEMESSHANDLER_GPDSCONFIGUREREQ, "CMmPacketServiceMessHandler::GpdsConfigureReq;aAolContext=%hhu", aAolContext );
+OstTraceExt1( TRACE_NORMAL,  DUP2_CMMPACKETSERVICEMESSHANDLER_GPDSCONFIGUREREQ_TD, "CMmPacketServiceMessHandler::GpdsConfigureReq;aAolContext=%hhu", aAolContext );
 break;
 }
 }
 void CMmPacketServiceMessHandler::GpdsConfigureResp(
 const TIsiReceiveC& aIsiMessage ) const
 {
 TFLOGSTRING("TSY: CMmPacketServiceMessHandler::GpdsConfigureResp.\n" );
-OstTrace0( TRACE_NORMAL, CMMPACKETSERVICEMESSHANDLER_GPDSCONFIGURERESP, "CMmPacketServiceMessHandler::GpdsConfigureResp" );
+OstTrace0( TRACE_NORMAL,  CMMPACKETSERVICEMESSHANDLER_GPDSCONFIGURERESP_TD, "CMmPacketServiceMessHandler::GpdsConfigureResp" );
 TInt errorValue( KErrNone );
 TBool called( EFalse );
 const TUint8 transactionId( aIsiMessage.Get8bit(
 // Get status
 const TUint8 status( aIsiMessage.Get8bit(
 ISI_HEADER_SIZE + GPDS_CONFIGURE_RESP_OFFSET_STATUS ) );
 TFLOGSTRING2("TSY: CMmPacketServiceMessHandler::GpdsConfigureResp.\n\t Status:%d\n", status );
-OstTraceExt1( TRACE_NORMAL, DUP1_CMMPACKETSERVICEMESSHANDLER_GPDSCONFIGURERESP, "CMmPacketServiceMessHandler::GpdsConfigureResp;status=%hhu", status );
+OstTraceExt1( TRACE_NORMAL,  DUP1_CMMPACKETSERVICEMESSHANDLER_GPDSCONFIGURERESP_TD, "CMmPacketServiceMessHandler::GpdsConfigureResp;status=%hhu", status );
 if ( GPDS_CONFIGURE_REQ == transactionId )
 {
 if ( GPDS_OK != status )
 {
 const TUint8 transferCause( aIsiMessage.Get8bit(
 ISI_HEADER_SIZE + GPDS_TRANSFER_STATUS_IND_OFFSET_TRANSFERCAUSE) );
 TFLOGSTRING2("TSY: CMmPacketServiceMessHandler::GpdsTransferStatusInd.\n  \t Transfer cause:%d\n", transferCause );
-OstTraceExt1( TRACE_NORMAL, CMMPACKETSERVICEMESSHANDLER_GPDSTRANSFERSTATUSIND, "CMmPacketServiceMessHandler::GpdsTransferStatusInd;transferCause=%hhu", transferCause );
+OstTraceExt1( TRACE_NORMAL,  CMMPACKETSERVICEMESSHANDLER_GPDSTRANSFERSTATUSIND_TD, "CMmPacketServiceMessHandler::GpdsTransferStatusInd;transferCause=%hhu", transferCause );
 CompleteTransferStatusIndication( transferCause );
 }
 // ----------------------------------------------------------------------------
 // Get context id from message
 const TUint8 contextId( aIsiMessage.Get8bit(
 ISI_HEADER_SIZE + GPDS_CONTEXT_ID_CREATE_IND_OFFSET_CID ) );
 TFLOGSTRING2("TSY: CMmPacketServiceMessHandler::GpdsContextIdCreateInd.\n\t Context Id:%d\n", contextId );
-OstTraceExt1( TRACE_NORMAL, CMMPACKETSERVICEMESSHANDLER_GPDSCONTEXTIDCREATEIND, "CMmPacketServiceMessHandler::GpdsContextIdCreateInd;contextId=%hhu", contextId );
+OstTraceExt1( TRACE_NORMAL,  CMMPACKETSERVICEMESSHANDLER_GPDSCONTEXTIDCREATEIND_TD, "CMmPacketServiceMessHandler::GpdsContextIdCreateInd;contextId=%hhu", contextId );
 // initial variables
 CMmDataPackage data;
 TInfoName contextName;
 contextName.Zero();
 // Get class C mode
 const TUint8 classC( aIsiMessage.Get8bit(
 ISI_HEADER_SIZE + GPDS_CONFIGURATION_INFO_IND_OFFSET_CLASSCMODE) );
 TFLOGSTRING2("TSY: CMmPacketServiceMessHandler::GpdsConfigurationInfoInd.\n\t Class C Mode:%d\n", classC );
-OstTraceExt1( TRACE_NORMAL, CMMPACKETSERVICEMESSHANDLER_GPDSCONFIGURATIONINFOIND, "CMmPacketServiceMessHandler::GpdsConfigurationInfoInd;classC=%hhu", classC );
+OstTraceExt1( TRACE_NORMAL,  CMMPACKETSERVICEMESSHANDLER_GPDSCONFIGURATIONINFOIND_TD, "CMmPacketServiceMessHandler::GpdsConfigurationInfoInd;classC=%hhu", classC );
 RPacketService::TPreferredBearer bearer(
 RPacketService::EBearerPacketSwitched );
 // set bearer
 //
 TInt CMmPacketServiceMessHandler::GpdsContextNwiActRejectReq() const
 {
 TFLOGSTRING("TSY: CMmPacketServiceMessHandler::GpdsContextNwiActRejectReq.\n" );
-OstTrace0( TRACE_NORMAL, CMMPACKETSERVICEMESSHANDLER_GPDSCONTEXTNWIACTREJECTREQ, "CMmPacketServiceMessHandler::GpdsContextNwiActRejectReq" );
+OstTrace0( TRACE_NORMAL,  CMMPACKETSERVICEMESSHANDLER_GPDSCONTEXTNWIACTREJECTREQ_TD, "CMmPacketServiceMessHandler::GpdsContextNwiActRejectReq" );
 // Introduce data buffer for needed GpdsContextNwiActRejectReq data
 // Needed length is 1
 TBuf8<1> data;
 data.Append( GPDS_CAUSE_ACT_REJECT );
 void CMmPacketServiceMessHandler::GpdsContextNwiActRejectResp(
 const TIsiReceiveC& /*aIsiMessage*/) const
 {
 TFLOGSTRING("TSY: CMmPacketServiceMessHandler::GpdsContextNwiActRejectResp.\n" );
-OstTrace0( TRACE_NORMAL, CMMPACKETSERVICEMESSHANDLER_GPDSCONTEXTNWIACTREJECTRESP, "CMmPacketServiceMessHandler::GpdsContextNwiActRejectResp" );
+OstTrace0( TRACE_NORMAL,  CMMPACKETSERVICEMESSHANDLER_GPDSCONTEXTNWIACTREJECTRESP_TD, "CMmPacketServiceMessHandler::GpdsContextNwiActRejectResp" );
 iMessageRouter->Complete(
 EPacketRejectActivationRequest,
 KErrNone );
 }
 // Read pdp type from isi message
 const TUint8 pdpType( aIsiMessage.Get8bit(
 ISI_HEADER_SIZE + GPDS_CONTEXT_NWI_ACT_REQUEST_IND_OFFSET_PDPTYPE ) );
 TFLOGSTRING2("TSY: CMmPacketServiceMessHandler::GpdsContextNwiActRequestInd. PdpType:%d", pdpType );
-OstTraceExt1( TRACE_NORMAL, CMMPACKETSERVICEMESSHANDLER_GPDSCONTEXTNWIACTREQUESTIND, "CMmPacketServiceMessHandler::GpdsContextNwiActRequestInd;pdpType=%hhu", pdpType );
+OstTraceExt1( TRACE_NORMAL,  CMMPACKETSERVICEMESSHANDLER_GPDSCONTEXTNWIACTREQUESTIND_TD, "CMmPacketServiceMessHandler::GpdsContextNwiActRequestInd;pdpType=%hhu", pdpType );
 TPtrC8 pdpAddress;
 TPtrC8 accessPointName;
 TUint sbStartOffSet( 0 );
 sbStartOffSet + GPDS_APN_INFO_OFFSET_APNNAME, apnSize ) );
 }
 //no else
 TFLOGSTRING2("TSY: CMmPacketServiceMessHandler::GpdsContextNwiActRequestInd.\n  \t Pdp Type:%d\n", pdpType );
-OstTraceExt1( TRACE_NORMAL, DUP1_CMMPACKETSERVICEMESSHANDLER_GPDSCONTEXTNWIACTREQUESTIND, "CMmPacketServiceMessHandler::GpdsContextNwiActRequestInd;pdpType=%hhu", pdpType );
+OstTraceExt1( TRACE_NORMAL,  DUP1_CMMPACKETSERVICEMESSHANDLER_GPDSCONTEXTNWIACTREQUESTIND_TD, "CMmPacketServiceMessHandler::GpdsContextNwiActRequestInd;pdpType=%hhu", pdpType );
 // Map server pdp type to client pdp type
 CMmStaticUtility::MapPdpTypeToClient(
 completeNotifyContextActivationReq.iPdpType, pdpType );
 TInt CMmPacketServiceMessHandler::GpdsConfigurationInfoReq(
 TBool aCalledOnInitPhase ) const
 {
 TFLOGSTRING("TSY: CMmPacketServiceMessHandler::GpdsConfigurationInfoReq.\n\t" );
-OstTrace0( TRACE_NORMAL, CMMPACKETSERVICEMESSHANDLER_GPDSCONFIGURATIONINFOREQ, "CMmPacketServiceMessHandler::GpdsConfigurationInfoReq" );
+OstTrace0( TRACE_NORMAL,  CMMPACKETSERVICEMESSHANDLER_GPDSCONFIGURATIONINFOREQ_TD, "CMmPacketServiceMessHandler::GpdsConfigurationInfoReq" );
 TBuf8<1> data;
 TUint8 transactionId( 0 );
 // Create gpds configuration info request
 void CMmPacketServiceMessHandler::GpdsConfigurationInfoResp(
 const TIsiReceiveC& aIsiMessage ) const
 {
 TFLOGSTRING("TSY: CMmPacketServiceMessHandler::GpdsConfigurationInfoResp.\n\t" );
-OstTrace0( TRACE_NORMAL, CMMPACKETSERVICEMESSHANDLER_GPDSCONFIGURATIONINFORESP, "CMmPacketServiceMessHandler::GpdsConfigurationInfoResp" );
+OstTrace0( TRACE_NORMAL,  CMMPACKETSERVICEMESSHANDLER_GPDSCONFIGURATIONINFORESP_TD, "CMmPacketServiceMessHandler::GpdsConfigurationInfoResp" );
 CMmDataPackage data;
 TBool ret( EFalse );
 // Is this request called
 // Get attach mode
 const TUint8 attachMode( aIsiMessage.Get8bit(
 ISI_HEADER_SIZE + GPDS_CONFIGURATION_INFO_RESP_OFFSET_ATTACHMODE ) );
 TFLOGSTRING2("TSY: CMmPacketServiceMessHandler::GpdsConfigurationInfoResp.\n\t Attach mode:%d\n", attachMode );
-OstTraceExt1( TRACE_NORMAL, DUP1_CMMPACKETSERVICEMESSHANDLER_GPDSCONFIGURATIONINFORESP, "CMmPacketServiceMessHandler::GpdsConfigurationInfoResp;attachMode=%hhu", attachMode );
+OstTraceExt1( TRACE_NORMAL,  DUP1_CMMPACKETSERVICEMESSHANDLER_GPDSCONFIGURATIONINFORESP_TD, "CMmPacketServiceMessHandler::GpdsConfigurationInfoResp;attachMode=%hhu", attachMode );
 RPacketService::TAttachMode attachModeForCompletion(
 RPacketService::EAttachWhenNeeded );
 if ( GPDS_ATTACH_MODE_AUTOMATIC == attachMode )
 void CMmPacketServiceMessHandler::GpdsContextConfigureResp(
 const TIsiReceiveC& aIsiMessage ) const
 {
 TFLOGSTRING("TSY: CMmPacketServiceMessHandler::GpdsContextConfigureResp.\n" );
-OstTrace0( TRACE_NORMAL, CMMPACKETSERVICEMESSHANDLER_GPDSCONTEXTCONFIGURERESP, "CMmPacketServiceMessHandler::GpdsContextConfigureResp" );
+OstTrace0( TRACE_NORMAL,  CMMPACKETSERVICEMESSHANDLER_GPDSCONTEXTCONFIGURERESP_TD, "CMmPacketServiceMessHandler::GpdsContextConfigureResp" );
 TBool called( EFalse );
 if ( GPDS_CONTEXT_CONFIGURE_REQ == aIsiMessage.Get8bit(
 ISI_HEADER_SIZE + GPDS_CONTEXT_CONFIGURE_RESP_OFFSET_UTID ) )
 TBuf8<KAccessPointBuffer256> aAccessPointName,
 TUint8 aPdpType )
 {
 TFLOGSTRING("TSY: CMmPacketServiceMessHandler::GpdsContextConfigureReq.\n" );
-OstTrace0( TRACE_NORMAL, CMMPACKETSERVICEMESSHANDLER_GPDSCONTEXTCONFIGUREREQ, "CMmPacketServiceMessHandler::GpdsContextConfigureReq" );
+OstTrace0( TRACE_NORMAL,  CMMPACKETSERVICEMESSHANDLER_GPDSCONTEXTCONFIGUREREQ_TD, "CMmPacketServiceMessHandler::GpdsContextConfigureReq" );
 // Append data for ISI message
 TBuf8<SIZE_GPDS_CONTEXT_CONFIGURE_REQ + SIZE_GPDS_COMP_INFO +
 SIZE_GPDS_APN_INFO + GPDS_MAX_APN_STRING_SIZE +
 SIZE_GPDS_SHARED_RADIO_ACTIVITY_REQ_INFO> messageData;
 const TUint8 aRegistrationStatus,
 const TUint8 aSuccessCode ) const
 {
 TFLOGSTRING2("TSY: CMmPacketServiceMessHandler::MapNtwkRegStatus. aRegistrationStatus: %d", aRegistrationStatus);
-OstTraceExt1( TRACE_NORMAL, CMMPACKETSERVICEMESSHANDLER_MAPNTWKREGSTATUS, "CMmPacketServiceMessHandler::MapNtwkRegStatus;aRegistrationStatus=%hhu", aRegistrationStatus );
+OstTraceExt1( TRACE_NORMAL,  CMMPACKETSERVICEMESSHANDLER_MAPNTWKREGSTATUS_TD, "CMmPacketServiceMessHandler::MapNtwkRegStatus;aRegistrationStatus=%hhu", aRegistrationStatus );
 RPacketService::TRegistrationStatus registrationStatus(
 RPacketService::EUnknown );
 switch ( aRegistrationStatus )
 }
 default:
 {
 TFLOGSTRING("TSY: CMmPacketServiceMessHandler::MapNtwkRegStatus: Default, DO NOTHING\n" );
-OstTrace0( TRACE_NORMAL, DUP1_CMMPACKETSERVICEMESSHANDLER_MAPNTWKREGSTATUS, "CMmPacketServiceMessHandler::MapNtwkRegStatus, Default, DO NOTHING" );
+OstTrace0( TRACE_NORMAL,  DUP1_CMMPACKETSERVICEMESSHANDLER_MAPNTWKREGSTATUS_TD, "CMmPacketServiceMessHandler::MapNtwkRegStatus, Default, DO NOTHING" );
 // Do nothing
 break;
 }
 }
 TFLOGSTRING3("TSY: CMmPacketServiceMessHandler::MapNtwkRegStatus.\n  \t Registration Status Server:%d\n\t Registration Status Client:%d\n", aRegistrationStatus, registrationStatus );
-OstTraceExt2( TRACE_NORMAL, DUP2_CMMPACKETSERVICEMESSHANDLER_MAPNTWKREGSTATUS, "CMmPacketServiceMessHandler::MapNtwkRegStatus;aRegistrationStatus=%hhu;registrationStatus=%d", aRegistrationStatus, registrationStatus );
+OstTraceExt2( TRACE_NORMAL,  DUP2_CMMPACKETSERVICEMESSHANDLER_MAPNTWKREGSTATUS_TD, "CMmPacketServiceMessHandler::MapNtwkRegStatus;aRegistrationStatus=%hhu;registrationStatus=%d", aRegistrationStatus, registrationStatus );
 return registrationStatus;
 }
 // ----------------------------------------------------------------------------
 const TBool aGprsSupportInCell,
 const TBool aEdgeGprsSupport )
 {
 TFLOGSTRING("TSY: CMmPacketServiceMessHandler::CompleteGsmRegistrationInfo.\n" );
-OstTrace0( TRACE_NORMAL, CMMPACKETSERVICEMESSHANDLER_COMPLETEGSMREGISTRATIONINFO, "CMmPacketServiceMessHandler::CompleteGsmRegistrationInfo" );
+OstTrace0( TRACE_NORMAL,  CMMPACKETSERVICEMESSHANDLER_COMPLETEGSMREGISTRATIONINFO_TD, "CMmPacketServiceMessHandler::CompleteGsmRegistrationInfo" );
 CMmDataPackage data;
 // save aCsServices internally
 iLastCsServices = aCsServices;
 // save aGprsSupportInCell internally
 //
 void CMmPacketServiceMessHandler::CompletePacketNotifyTransferCaps(
 const TBool aEdgeGprsSupport )
 {
 TFLOGSTRING("TSY: CMmPacketServiceMessHandler::CompletePacketNotifyTransferCaps.\n" );
-OstTrace0( TRACE_NORMAL, CMMPACKETSERVICEMESSHANDLER_COMPLETEPACKETNOTIFYTRANSFERCAPS, "CMmPacketServiceMessHandler::CompletePacketNotifyTransferCaps" );
+OstTrace0( TRACE_NORMAL,  CMMPACKETSERVICEMESSHANDLER_COMPLETEPACKETNOTIFYTRANSFERCAPS_TD, "CMmPacketServiceMessHandler::CompletePacketNotifyTransferCaps" );
 TDynamicTransferCapsFlags transferCaps ( 0 );
 if ( aEdgeGprsSupport )
 {
 transferCaps |= KCapsEGPRS;
 TFLOGSTRING2( "TSY: CMmPacketServiceMessHandler::CompletePacketNotifyTransferCaps, Transfer Caps = %d.", transferCaps );
-OstTrace1( TRACE_NORMAL, DUP2_CMMPACKETSERVICEMESSHANDLER_COMPLETEPACKETNOTIFYTRANSFERCAPS, "CMmPacketServiceMessHandler::CompletePacketNotifyTransferCaps;transferCaps=%d", transferCaps );
+OstTrace1( TRACE_NORMAL,  DUP2_CMMPACKETSERVICEMESSHANDLER_COMPLETEPACKETNOTIFYTRANSFERCAPS_TD, "CMmPacketServiceMessHandler::CompletePacketNotifyTransferCaps;transferCaps=%d", transferCaps );
 }
 if ( iLastHsdpaAllocationStatus )
 {
 transferCaps |= KCapsHSDPA;
 TFLOGSTRING2( "TSY: CMmPacketServiceMessHandler::CompletePacketNotifyTransferCaps, Transfer Caps = %d.", transferCaps );
-OstTrace1( TRACE_NORMAL, DUP1_CMMPACKETSERVICEMESSHANDLER_COMPLETEPACKETNOTIFYTRANSFERCAPS, "CMmPacketServiceMessHandler::CompletePacketNotifyTransferCaps;transferCaps=%d", transferCaps );
+OstTrace1( TRACE_NORMAL,  DUP1_CMMPACKETSERVICEMESSHANDLER_COMPLETEPACKETNOTIFYTRANSFERCAPS_TD, "CMmPacketServiceMessHandler::CompletePacketNotifyTransferCaps;transferCaps=%d", transferCaps );
 }
 CMmDataPackage dataPackage;
 dataPackage.PackData( &transferCaps );
 //
 void CMmPacketServiceMessHandler::CompleteDynamicCapsChange()
 {
 TFLOGSTRING("TSY: CMmPacketServiceMessHandler::CompleteDynamicCapsChange.");
-OstTrace0( TRACE_NORMAL, CMMPACKETSERVICEMESSHANDLER_COMPLETEDYNAMICCAPSCHANGE, "CMmPacketServiceMessHandler::CompleteDynamicCapsChange" );
+OstTrace0( TRACE_NORMAL,  CMMPACKETSERVICEMESSHANDLER_COMPLETEDYNAMICCAPSCHANGE_TD, "CMmPacketServiceMessHandler::CompleteDynamicCapsChange" );
 CMmDataPackage data;
 data.PackData( &iLastGprsSupportInCell, &iLastCsServices );
 iMessageRouter->Complete (
 TInt CMmPacketServiceMessHandler::SetAttachMode(
 RPacketService::TAttachMode* const aMode )
 {
 TFLOGSTRING2("TSY: CMmPacketServiceMessHandler::SetAttachMode.\n\t Attach Mode:%d\n", *aMode );
-OstTraceExt1( TRACE_NORMAL, CMMPACKETSERVICEMESSHANDLER_SETATTACHMODE, "CMmPacketServiceMessHandler::SetAttachMode;aMode=%hhu", *aMode );
+OstTraceExt1( TRACE_NORMAL,  CMMPACKETSERVICEMESSHANDLER_SETATTACHMODE_TD, "CMmPacketServiceMessHandler::SetAttachMode;aMode=%hhu", *aMode );
 TInt ret( KErrNone );
 TUint8 attachMode( GPDS_ATTACH_MODE_DEFAULT );
 if ( RPacketService::EAttachWhenPossible == *aMode )
 //
 CMmPacketContextMesshandlerList* CMmPacketServiceMessHandler::PacketContextList()
 {
 TFLOGSTRING("TSY: CMmPacketServiceMessHandler::PacketContextList.");
-OstTrace0( TRACE_NORMAL, CMMPACKETSERVICEMESSHANDLER_PACKETCONTEXTLIST, "CMmPacketServiceMessHandler::PacketContextList" );
+OstTrace0( TRACE_NORMAL,  CMMPACKETSERVICEMESSHANDLER_PACKETCONTEXTLIST_TD, "CMmPacketServiceMessHandler::PacketContextList" );
 return iPacketMesshandlerContextList;
 }
 // ----------------------------------------------------------------------------
 //
 CMmMessageRouter* CMmPacketServiceMessHandler::GetMessageRouter()
 {
 TFLOGSTRING("TSY: CMmPacketServiceMessHandler::GetMessageRouter");
-OstTrace0( TRACE_NORMAL, CMMPACKETSERVICEMESSHANDLER_GETMESSAGEROUTER, "CMmPacketServiceMessHandler::GetMessageRouter" );
+OstTrace0( TRACE_NORMAL,  CMMPACKETSERVICEMESSHANDLER_GETMESSAGEROUTER_TD, "CMmPacketServiceMessHandler::GetMessageRouter" );
 return iMessageRouter;
 }
 TInt CMmPacketServiceMessHandler::SetPreferredBearer(
 const CMmDataPackage& aDataPackage )
 {
 TFLOGSTRING("TSY: CMmPacketServiceMessHandler::SetPreferredBearer");
-OstTrace0( TRACE_NORMAL, CMMPACKETSERVICEMESSHANDLER_SETPREFERREDBEARER, "CMmPacketServiceMessHandler::SetPreferredBearer" );
+OstTrace0( TRACE_NORMAL,  CMMPACKETSERVICEMESSHANDLER_SETPREFERREDBEARER_TD, "CMmPacketServiceMessHandler::SetPreferredBearer" );
 RPacketService::TPreferredBearer* abearer = NULL;
 TInt ret( KErrNone );
 aDataPackage.UnPackData( &abearer );
 TFLOGSTRING2("TSY: CMmPacketServiceMessHandler::SetPreferredBearer.\n\t Preferred Bearer:%d\n", &abearer );
-OstTraceExt1( TRACE_NORMAL, DUP1_CMMPACKETSERVICEMESSHANDLER_SETPREFERREDBEARER, "CMmPacketServiceMessHandler::SetPreferredBearer;abearer=%hhu", *abearer );
+OstTraceExt1( TRACE_NORMAL,  DUP1_CMMPACKETSERVICEMESSHANDLER_SETPREFERREDBEARER_TD, "CMmPacketServiceMessHandler::SetPreferredBearer;abearer=%hhu", *abearer );
 TUint8 bearer( GPDS_CLASSC_MODE_DEFAULT );
 if ( RPacketService::EBearerCircuitSwitched == *abearer )
 {
 TInt CMmPacketServiceMessHandler::SetDefaultContextParams(
 const CMmDataPackage& aPackage )
 {
 TFLOGSTRING("TSY: CMmPacketServiceMessHandler::SetDefaultContextParams");
-OstTrace0( TRACE_NORMAL, CMMPACKETSERVICEMESSHANDLER_SETDEFAULTCONTEXTPARAMS, "CMmPacketServiceMessHandler::SetDefaultContextParams" );
+OstTrace0( TRACE_NORMAL,  CMMPACKETSERVICEMESSHANDLER_SETDEFAULTCONTEXTPARAMS_TD, "CMmPacketServiceMessHandler::SetDefaultContextParams" );
 TInt ret( KErrNotSupported );
 TUint8 dataCompression( GPDS_PDP_HCOMP_DEFAULT );
 TUint8 headerCompression( GPDS_PDP_HCOMP_DEFAULT );
 // temporary access point name
 // Check that the mode given in aconfig is GPRS
 if ( TPacketDataConfigBase::KConfigGPRS == aconfig->ExtensionId() )
 {
 TFLOGSTRING("TSY: CMmPacketServiceMessHandler::SetDefaultContextParams. ExtensionId: KConfigGPRS");
-OstTrace0( TRACE_NORMAL, DUP1_CMMPACKETSERVICEMESSHANDLER_SETDEFAULTCONTEXTPARAMS, "CMmPacketServiceMessHandler::SetDefaultContextParams, ExtensionId: KConfigGPRS" );
+OstTrace0( TRACE_NORMAL,  DUP1_CMMPACKETSERVICEMESSHANDLER_SETDEFAULTCONTEXTPARAMS_TD, "CMmPacketServiceMessHandler::SetDefaultContextParams, ExtensionId: KConfigGPRS" );
 RPacketContext::TContextConfigGPRS& configGPRS =
 *reinterpret_cast<RPacketContext::TContextConfigGPRS*>( aconfig );
 // Set data compression
 else if ( TPacketDataConfigBase::KConfigRel99Rel4 ==
 aconfig->ExtensionId() )
 {
 TFLOGSTRING("TSY: CMmPacketServiceMessHandler::SetDefaultContextParams. ExtensionId: KConfigRel99Rel4");
-OstTrace0( TRACE_NORMAL, DUP2_CMMPACKETSERVICEMESSHANDLER_SETDEFAULTCONTEXTPARAMS, "CMmPacketServiceMessHandler::SetDefaultContextParams, ExtensionId: KConfigRel99Rel4" );
+OstTrace0( TRACE_NORMAL,  DUP2_CMMPACKETSERVICEMESSHANDLER_SETDEFAULTCONTEXTPARAMS_TD, "CMmPacketServiceMessHandler::SetDefaultContextParams, ExtensionId: KConfigRel99Rel4" );
 RPacketContext::TContextConfigR99_R4& configR99_R4 =
 *reinterpret_cast<RPacketContext::TContextConfigR99_R4*>(
 aconfig );
 //
 void CMmPacketServiceMessHandler::CompleteTransferStatusIndication(
 const TUint8 aTransferCause )
 {
 TFLOGSTRING2("TSY: CMmPacketServiceMessHandler::CompleteTransferStatusIndication.\n  \t Transfer Cause:%d\n", aTransferCause );
-OstTraceExt1( TRACE_NORMAL, CMMPACKETSERVICEMESSHANDLER_COMPLETETRANSFERSTATUSINDICATION, "CMmPacketServiceMessHandler::CompleteTransferStatusIndication;aTransferCause=%hhu", aTransferCause );
+OstTraceExt1( TRACE_NORMAL,  CMMPACKETSERVICEMESSHANDLER_COMPLETETRANSFERSTATUSINDICATION_TD, "CMmPacketServiceMessHandler::CompleteTransferStatusIndication;aTransferCause=%hhu", aTransferCause );
 RPacketService::TStatus packetStatus( RPacketService::EStatusAttached );
 RMmCustomAPI::TRauEventStatus rauindication( RMmCustomAPI::ERauEventActive );
 TInt error( KErrNone );
 resumed = ETrue;
 rauindication = RMmCustomAPI::ERauEventResumed;
 data.PackData( &rauindication );
 iMessageRouter->Complete( ECustomNotifyRauEventIPC, &data, error );
 TFLOGSTRING2("TSY: CMmPacketServiceMessHandler::CompleteTransferStatusIndicationResumed.\n  \t Rau indication:%d\n", rauindication );
-OstTraceExt1( TRACE_NORMAL, DUP1_CMMPACKETSERVICEMESSHANDLER_COMPLETETRANSFERSTATUSINDICATION, "CMmPacketServiceMessHandler::CompleteTransferStatusIndication;rauindication=%hhu", rauindication );
+OstTraceExt1( TRACE_NORMAL,  DUP1_CMMPACKETSERVICEMESSHANDLER_COMPLETETRANSFERSTATUSINDICATION_TD, "CMmPacketServiceMessHandler::CompleteTransferStatusIndication;rauindication=%hhu", rauindication );
 break;
 }
 case GPDS_TRANSFER_CAUSE_ATTACHED:
 {
 // packetStatus is 'RPacketService::EStatusAttached' by default, do nothing
 break;
 }
 case GPDS_TRANSFER_CAUSE_SUSPENDED_RAU :
 {
 TFLOGSTRING2("TSY: CMmPacketServiceMessHandler::CompleteTransferStatusIndicationActivated.\n  \t Rau indication:%d\n", rauindication );
-OstTraceExt1( TRACE_NORMAL, DUP2_CMMPACKETSERVICEMESSHANDLER_COMPLETETRANSFERSTATUSINDICATION, "CMmPacketServiceMessHandler::CompleteTransferStatusIndication;rauindication=%hhu", rauindication );
+OstTraceExt1( TRACE_NORMAL,  DUP2_CMMPACKETSERVICEMESSHANDLER_COMPLETETRANSFERSTATUSINDICATION_TD, "CMmPacketServiceMessHandler::CompleteTransferStatusIndication;rauindication=%hhu", rauindication );
 // rauindication is 'RMmCustomAPI::ERauEventActive' by default, no need to set here
 data.PackData( &rauindication );
 iMessageRouter->Complete( ECustomNotifyRauEventIPC, &data, error );
 completeToTsy = EFalse;
 break;
 }
 #if ( NCP_COMMON_CELLMO_BRANCH_SUPPORT == NCP_COMMON_CELLMO_BRANCH_0711 )
 case GPDS_TRANSFER_CAUSE_DSAC_RESTRICTION:
 {
 TFLOGSTRING("TSY: CMmPacketServiceMessHandler::CompleteTransferStatusIndication. DSAC: connection failed because of barred PS \n");
-OstTrace0( TRACE_NORMAL, DUP4_CMMPACKETSERVICEMESSHANDLER_COMPLETETRANSFERSTATUSINDICATION, "CMmPacketServiceMessHandler::CompleteTransferStatusIndication, DSAC: connection failed because of barred PS \n" );
+OstTrace0( TRACE_NORMAL,  DUP4_CMMPACKETSERVICEMESSHANDLER_COMPLETETRANSFERSTATUSINDICATION_TD, "CMmPacketServiceMessHandler::CompleteTransferStatusIndication, DSAC: connection failed because of barred PS \n" );
 // Core error and extended error are completed to CTSY
 error = ( KErrGeneral & 0x0000FFFF ) |
 ( KErrGsmPSConnectionBarred << 16 );
 break;
 }
 #endif // NCP_COMMON_CELLMO_BRANCH_SUPPORT == NCP_COMMON_CELLMO_BRANCH_0711
 default:
 {
 TFLOGSTRING("TSY: CMmPacketServiceMessHandler::CompleteTransferStatusIndication.Default case: DO NOTHING\n");
-OstTrace0( TRACE_NORMAL, DUP3_CMMPACKETSERVICEMESSHANDLER_COMPLETETRANSFERSTATUSINDICATION, "CMmPacketServiceMessHandler::CompleteTransferStatusIndication, Default case: DO NOTHING" );
+OstTrace0( TRACE_NORMAL,  DUP3_CMMPACKETSERVICEMESSHANDLER_COMPLETETRANSFERSTATUSINDICATION_TD, "CMmPacketServiceMessHandler::CompleteTransferStatusIndication, Default case: DO NOTHING" );
 break;
 }
 }
 if ( completeToTsy )
 void CMmPacketServiceMessHandler::CompleteNotifyMSClassChange(
 const TUint8 aGprsNetworkMode )
 {
 TFLOGSTRING("TSY: CMmPacketServiceMessHandler::CompleteNotifyMSClassChange");
-OstTrace0( TRACE_NORMAL, CMMPACKETSERVICEMESSHANDLER_COMPLETENOTIFYMSCLASSCHANGE, "CMmPacketServiceMessHandler::CompleteNotifyMSClassChange" );
+OstTrace0( TRACE_NORMAL,  CMMPACKETSERVICEMESSHANDLER_COMPLETENOTIFYMSCLASSCHANGE_TD, "CMmPacketServiceMessHandler::CompleteNotifyMSClassChange" );
 CMmDataPackage data;
 RPacketService::TMSClass msClass( RPacketService::EMSClassUnknown );
 // If Gprs supported in current cell
 const TUint8 aAttachStatus,
 const TUint8 aTransferStatus )
 {
 TFLOGSTRING3("TSY: CMmPacketService::CompleteGpdsStatusRequest.\n\t Attach Status:%d\n\t Transfer Status:%d\n", aAttachStatus, aTransferStatus );
-OstTraceExt1( TRACE_NORMAL, CMMPACKETSERVICEMESSHANDLER_COMPLETEGPDSSTATUSREQUEST, "CMmPacketServiceMessHandler::CompleteGpdsStatusRequest;aAttachStatus=%hhu", aAttachStatus );
+OstTraceExt1( TRACE_NORMAL,  CMMPACKETSERVICEMESSHANDLER_COMPLETEGPDSSTATUSREQUEST_TD, "CMmPacketServiceMessHandler::CompleteGpdsStatusRequest;aAttachStatus=%hhu", aAttachStatus );
 // Initiate EStatusAttached to packet status
 RPacketService::TStatus packetStatus( RPacketService::EStatusAttached );
 if ( GPDS_DETACHED == aAttachStatus )
 // ----------------------------------------------------------------------------
 //
 TInt CMmPacketServiceMessHandler::NetRatReq()
 {
 TFLOGSTRING("TSY: CMmPacketServiceMessHandler::NetRatReq");
-OstTrace0( TRACE_NORMAL, CMMPACKETSERVICEMESSHANDLER_NETRATREQ, "CMmPacketServiceMessHandler::NetRatReq" );
+OstTrace0( TRACE_NORMAL,  CMMPACKETSERVICEMESSHANDLER_NETRATREQ_TD, "CMmPacketServiceMessHandler::NetRatReq" );
 // Set the message data that consists of one parameters
 TBuf8<KBuffSizeOneByte> messageData;
 // Ask information of current network radio access technology
 messageData.Append( NET_CURRENT_RAT );
 void CMmPacketServiceMessHandler::NetRatIndOrResp(
 const TIsiReceiveC &aIsiMessage )
 {
 TFLOGSTRING("TSY: CMmPacketServiceMessHandler::NetRatIndOrResp");
-OstTrace0( TRACE_NORMAL, CMMPACKETSERVICEMESSHANDLER_NETRATINDORRESP, "CMmPacketServiceMessHandler::NetRatIndOrResp" );
+OstTrace0( TRACE_NORMAL,  CMMPACKETSERVICEMESSHANDLER_NETRATINDORRESP_TD, "CMmPacketServiceMessHandler::NetRatIndOrResp" );
 TBool readSubBlock( ETrue );
 TBool isNetRatResp( NET_RAT_RESP == aIsiMessage.
 Get8bit( ISI_HEADER_OFFSET_MESSAGEID ) );
 {
 // GSM currently not supported.
 TFLOGSTRING("TSY: CMmPacketServiceMessHandler::NetRatIndOrResp. RMobilePhone::ENetworkModeGsm");
 ntwkMode = RMobilePhone::ENetworkModeGsm;
-OstTrace0( TRACE_NORMAL, DUP1_CMMPACKETSERVICEMESSHANDLER_NETRATINDORRESP, "CMmPacketServiceMessHandler::NetRatIndOrResp, RMobilePhone::ENetworkModeGsm" );
+OstTrace0( TRACE_NORMAL,  DUP1_CMMPACKETSERVICEMESSHANDLER_NETRATINDORRESP_TD, "CMmPacketServiceMessHandler::NetRatIndOrResp, RMobilePhone::ENetworkModeGsm" );
 }
 // Else if Wcdma Rat is supported
 else if ( NET_UMTS_RAT == ratName )
 {
 // WCDMA currently not supported.
 TFLOGSTRING("TSY: CMmPacketServiceMessHandler::NetRatIndOrResp. RMobilePhone::ENetworkModeWcdma");
-OstTrace0( TRACE_NORMAL, DUP2_CMMPACKETSERVICEMESSHANDLER_NETRATINDORRESP, "CMmPacketServiceMessHandler::NetRatIndOrResp, RMobilePhone::ENetworkModeWcdma" );
+OstTrace0( TRACE_NORMAL,  DUP2_CMMPACKETSERVICEMESSHANDLER_NETRATINDORRESP_TD, "CMmPacketServiceMessHandler::NetRatIndOrResp, RMobilePhone::ENetworkModeWcdma" );
 ntwkMode = RMobilePhone::ENetworkModeWcdma;
 }
 // Store networkmode internally
 iCurrentMode = ntwkMode;
 const TIsiReceiveC& /*aIsiMessage*/,
 TInt /*aError*/ )
 {
 TFLOGSTRING("TSY: CMmPacketServiceMessHandler::HandleError DO NOTHING");
-OstTrace0( TRACE_NORMAL, CMMPACKETSERVICEMESSHANDLER_HANDLEERROR, "CMmPacketServiceMessHandler::HandleError DO NOTHING" );
+OstTrace0( TRACE_NORMAL,  CMMPACKETSERVICEMESSHANDLER_HANDLEERROR_TD, "CMmPacketServiceMessHandler::HandleError DO NOTHING" );
 //none
 }
 // -----------------------------------------------------------------------------
 // CMmPacketServiceMessHandler::NetRadioInfoInd
 void CMmPacketServiceMessHandler::NetRadioInfoInd(
 const TIsiReceiveC& aIsiMessage )  // received ISI message
 {
 TFLOGSTRING( "TSY: CMmPacketServiceMessHandler::NetRadioInfoInd" );
-OstTrace0( TRACE_NORMAL, CMMPACKETSERVICEMESSHANDLER_NETRADIOINFOIND, "CMmPacketServiceMessHandler::NetRadioInfoInd" );
+OstTrace0( TRACE_NORMAL,  CMMPACKETSERVICEMESSHANDLER_NETRADIOINFOIND_TD, "CMmPacketServiceMessHandler::NetRadioInfoInd" );
 TDynamicTransferCapsFlags transferCaps ( 0 );
 TBool hsdpaAllocated ( EFalse );
 // Find NET_UTRAN_RADIO_INFO sub block
 // Save HSDPA allocation status
 iLastHsdpaAllocationStatus = hsdpaAllocated;
 TFLOGSTRING2( "TSY: CMmPacketServiceMessHandler::NetRadioInfoInd, HSDPA Allocated = %d.", hsdpaAllocated );
-OstTraceExt1( TRACE_NORMAL, DUP1_CMMPACKETSERVICEMESSHANDLER_NETRADIOINFOIND, "CMmPacketServiceMessHandler::NetRadioInfoInd;hsdpaAllocated=%hhu", hsdpaAllocated );
+OstTraceExt1( TRACE_NORMAL,  DUP1_CMMPACKETSERVICEMESSHANDLER_NETRADIOINFOIND_TD, "CMmPacketServiceMessHandler::NetRadioInfoInd;hsdpaAllocated=%hhu", hsdpaAllocated );
 }
 // Dynamic transfer caps
 if ( hsdpaAllocated )
 {
 transferCaps |= KCapsHSDPA;
 TFLOGSTRING2( "TSY: CMmPacketServiceMessHandler::NetRadioInfoInd, Transfer Caps = %d.", transferCaps );
-OstTrace1( TRACE_NORMAL, DUP3_CMMPACKETSERVICEMESSHANDLER_NETRADIOINFOIND, "CMmPacketServiceMessHandler::NetRadioInfoInd;transferCaps=%d", transferCaps );
+OstTrace1( TRACE_NORMAL,  DUP3_CMMPACKETSERVICEMESSHANDLER_NETRADIOINFOIND_TD, "CMmPacketServiceMessHandler::NetRadioInfoInd;transferCaps=%d", transferCaps );
 }
 // This is done for SUB 403-7200: NokiaTSY: HSUPA Cell Indicator for S60 (S60 3.2.2 / S_CPR8.1).
 // This can be removed when actual implementation for HSUPA Cell Indicator is done.
 // CASW_HSXPA_INDICATOR_SUPPORTED flag.
 // Get HSUPA allocation status
 hsupaAllocated = aIsiMessage.Get8bit( sbStartOffSet +
 NET_UTRAN_RADIO_INFO_OFFSET_HSUPAALLOCATED );
 TFLOGSTRING2( "TSY: CMmPacketServiceMessHandler::NetRadioInfoInd, HSUPA Allocated = %d.", hsupaAllocated );
-OstTraceExt1( TRACE_NORMAL, DUP2_CMMPACKETSERVICEMESSHANDLER_NETRADIOINFOIND, "CMmPacketServiceMessHandler::NetRadioInfoInd;hsupaAllocated=%hhu", hsupaAllocated );
+OstTraceExt1( TRACE_NORMAL,  DUP2_CMMPACKETSERVICEMESSHANDLER_NETRADIOINFOIND_TD, "CMmPacketServiceMessHandler::NetRadioInfoInd;hsupaAllocated=%hhu", hsupaAllocated );
 }
 if ( hsdpaAllocated || hsupaAllocated )
 {
 transferCaps |= KCapsHSDPA;
 // Save HSDPA allocation status
 iLastHsdpaAllocationStatus = ETrue;
 TFLOGSTRING2( "TSY: CMmPacketServiceMessHandler::NetRadioInfoInd, Transfer Caps (HSDPA or HSUPA) = %d.", transferCaps );
-OstTrace1( TRACE_NORMAL, DUP4_CMMPACKETSERVICEMESSHANDLER_NETRADIOINFOIND, "CMmPacketServiceMessHandler::NetRadioInfoInd;transferCaps=%d", transferCaps );
+OstTrace1( TRACE_NORMAL,  DUP4_CMMPACKETSERVICEMESSHANDLER_NETRADIOINFOIND_TD, "CMmPacketServiceMessHandler::NetRadioInfoInd;transferCaps=%d", transferCaps );
 }
 #endif // defined ( CASW_HSXPA_INDICATOR_SUPPORTED ) || defined ( INTERNAL_TESTING_CASW_HSXPA_INDICATOR_SUPPORT )
 if ( iLastEdgeGprsSupport )
 {
 transferCaps |= KCapsEGPRS;
 TFLOGSTRING2( "TSY: CMmPacketServiceMessHandler::NetRadioInfoInd, Transfer Caps = %d.", transferCaps );
-OstTrace1( TRACE_NORMAL, DUP5_CMMPACKETSERVICEMESSHANDLER_NETRADIOINFOIND, "CMmPacketServiceMessHandler::NetRadioInfoInd;transferCaps=%d", transferCaps );
+OstTrace1( TRACE_NORMAL,  DUP5_CMMPACKETSERVICEMESSHANDLER_NETRADIOINFOIND_TD, "CMmPacketServiceMessHandler::NetRadioInfoInd;transferCaps=%d", transferCaps );
 }
 // Pack the data
 CMmDataPackage dataPackage;
 dataPackage.PackData( &transferCaps );

changeset 9	8486d82aef45
parent 5	8ccc39f9d787